diff --git a/deps/bin/msvc12/x64/OpenAL32.dll b/deps/bin/msvc12/x64/OpenAL32.dll new file mode 100644 index 0000000..02ecaf3 Binary files /dev/null and b/deps/bin/msvc12/x64/OpenAL32.dll differ diff --git a/deps/bin/msvc12/x64/soft_oal.dll b/deps/bin/msvc12/x64/soft_oal.dll new file mode 100644 index 0000000..a718bdc Binary files /dev/null and b/deps/bin/msvc12/x64/soft_oal.dll differ diff --git a/deps/lib/mingw/x64/libbgfx.a b/deps/lib/mingw/x64/libbgfx.a deleted file mode 100755 index 5fccbf5..0000000 Binary files a/deps/lib/mingw/x64/libbgfx.a and /dev/null differ diff --git a/deps/lib/mingw/x64/libbgfxd.a b/deps/lib/mingw/x64/libbgfxd.a deleted file mode 100755 index 4ccd75b..0000000 Binary files a/deps/lib/mingw/x64/libbgfxd.a and /dev/null differ diff --git a/deps/lib/msvc12/x64/OpenAL32.def b/deps/lib/msvc12/x64/OpenAL32.def new file mode 100644 index 0000000..6cd7ffa --- /dev/null +++ b/deps/lib/msvc12/x64/OpenAL32.def @@ -0,0 +1,187 @@ +EXPORTS + alAuxiliaryEffectSlotf + alAuxiliaryEffectSlotfv + alAuxiliaryEffectSloti + alAuxiliaryEffectSlotiv + alBuffer3f + alBuffer3i + alBufferData + alBufferSamplesSOFT + alBufferSubDataSOFT + alBufferSubSamplesSOFT + alBufferf + alBufferfv + alBufferi + alBufferiv + alDeferUpdatesSOFT + alDeleteAuxiliaryEffectSlots + alDeleteBuffers + alDeleteEffects + alDeleteFilters + alDeleteFontsoundsSOFT + alDeletePresetsSOFT + alDeleteSoundfontsSOFT + alDeleteSources + alDisable + alDistanceModel + alDopplerFactor + alDopplerVelocity + alEffectf + alEffectfv + alEffecti + alEffectiv + alEnable + alFilterf + alFilterfv + alFilteri + alFilteriv + alFontsound2iSOFT + alFontsoundModulatoriSOFT + alFontsoundiSOFT + alFontsoundivSOFT + alGenAuxiliaryEffectSlots + alGenBuffers + alGenEffects + alGenFilters + alGenFontsoundsSOFT + alGenPresetsSOFT + alGenSoundfontsSOFT + alGenSources + alGetAuxiliaryEffectSlotf + alGetAuxiliaryEffectSlotfv + alGetAuxiliaryEffectSloti + alGetAuxiliaryEffectSlotiv + alGetBoolean + alGetBooleanv + alGetBuffer3f + alGetBuffer3i + alGetBufferSamplesSOFT + alGetBufferf + alGetBufferfv + alGetBufferi + alGetBufferiv + alGetDouble + alGetDoublev + alGetEffectf + alGetEffectfv + alGetEffecti + alGetEffectiv + alGetEnumValue + alGetError + alGetFilterf + alGetFilterfv + alGetFilteri + alGetFilteriv + alGetFloat + alGetFloatv + alGetFontsoundModulatorivSOFT + alGetFontsoundivSOFT + alGetInteger + alGetInteger64SOFT + alGetInteger64vSOFT + alGetIntegerv + alGetListener3f + alGetListener3i + alGetListenerf + alGetListenerfv + alGetListeneri + alGetListeneriv + alGetPresetivSOFT + alGetProcAddress + alGetSoundfontivSOFT + alGetSource3dSOFT + alGetSource3f + alGetSource3i + alGetSource3i64SOFT + alGetSourcedSOFT + alGetSourcedvSOFT + alGetSourcef + alGetSourcefv + alGetSourcei + alGetSourcei64SOFT + alGetSourcei64vSOFT + alGetSourceiv + alGetString + alIsAuxiliaryEffectSlot + alIsBuffer + alIsBufferFormatSupportedSOFT + alIsEffect + alIsEnabled + alIsExtensionPresent + alIsFilter + alIsFontsoundSOFT + alIsPresetSOFT + alIsSoundfontSOFT + alIsSource + alListener3f + alListener3i + alListenerf + alListenerfv + alListeneri + alListeneriv + alLoadSoundfontSOFT + alMidiEventSOFT + alMidiGainSOFT + alMidiPauseSOFT + alMidiPlaySOFT + alMidiResetSOFT + alMidiSoundfontSOFT + alMidiSoundfontvSOFT + alMidiStopSOFT + alMidiSysExSOFT + alPresetFontsoundsSOFT + alPresetiSOFT + alPresetivSOFT + alProcessUpdatesSOFT + alSoundfontPresetsSOFT + alSource3dSOFT + alSource3f + alSource3i + alSource3i64SOFT + alSourcePause + alSourcePausev + alSourcePlay + alSourcePlayv + alSourceQueueBuffers + alSourceRewind + alSourceRewindv + alSourceStop + alSourceStopv + alSourceUnqueueBuffers + alSourcedSOFT + alSourcedvSOFT + alSourcef + alSourcefv + alSourcei + alSourcei64SOFT + alSourcei64vSOFT + alSourceiv + alSpeedOfSound + alcCaptureCloseDevice + alcCaptureOpenDevice + alcCaptureSamples + alcCaptureStart + alcCaptureStop + alcCloseDevice + alcCreateContext + alcDestroyContext + alcDevicePauseSOFT + alcDeviceResumeSOFT + alcGetContextsDevice + alcGetCurrentContext + alcGetEnumValue + alcGetError + alcGetInteger64vSOFT + alcGetIntegerv + alcGetProcAddress + alcGetString + alcGetThreadContext + alcIsExtensionPresent + alcIsRenderFormatSupportedSOFT + alcLoopbackOpenDeviceSOFT + alcMakeContextCurrent + alcOpenDevice + alcProcessContext + alcRenderSamplesSOFT + alcSetThreadContext + alcSuspendContext diff --git a/deps/lib/msvc12/x64/OpenAL32.lib b/deps/lib/msvc12/x64/OpenAL32.lib new file mode 100644 index 0000000..88dfed1 Binary files /dev/null and b/deps/lib/msvc12/x64/OpenAL32.lib differ diff --git a/deps/lib/msvc12/x64/liquidfun.lib b/deps/lib/msvc12/x64/liquidfun.lib new file mode 100644 index 0000000..3fc9a30 Binary files /dev/null and b/deps/lib/msvc12/x64/liquidfun.lib differ diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 8a8cca5..b4fe3b4 100755 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -7,7 +7,6 @@ find_package(Boost REQUIRED COMPONENTS system filesystem thread chrono) find_package(assimp REQUIRED) find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) -find_package(BGFX REQUIRED) find_package(liquidfun REQUIRED) # Because FindOpenAL is retarded set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${CMAKE_SOURCE_DIR}/deps/include/AL") @@ -28,7 +27,6 @@ include_directories( ${assimp_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${X11_INCLUDE_DIRS} - ${BGFX_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${liquidfun_INCLUDE_DIRS} ) @@ -111,7 +109,6 @@ target_link_libraries(game ${assimp_LIBRARIES} ${PNG_LIBRARIES} ${X11_LIBRARIES} - ${BGFX_LIBRARIES} ${OPENAL_LIBRARY} ${liquidfun_LIBRARIES} ) @@ -128,7 +125,6 @@ target_link_libraries(breakout ${assimp_LIBRARIES} ${PNG_LIBRARIES} ${X11_LIBRARIES} - ${BGFX_LIBRARIES} ${OPENAL_LIBRARY} ${liquidfun_LIBRARIES} )