diff --git a/CMakeLists.txt b/CMakeLists.txt index c12ae23..cb725f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,10 +10,10 @@ set(OUT_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/src/SoLoud/") # Support both 32 and 64 bit builds if (${CMAKE_SIZEOF_VOID_P} MATCHES 8) - set(MAIN_LIBRARIES "${CMAKE_CURRENT_LIST_DIR}/lib/x64/soloud.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x64/SDL2.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x64/SDL2main.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x64/SDL2_image.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x64/SDL2_ttf.lib") + set(MAIN_LIBRARIES "${CMAKE_CURRENT_LIST_DIR}/lib/x64/soloud_static.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x64/SDL2.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x64/SDL2main.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x64/SDL2_image.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x64/SDL2_ttf.lib") set(MAIN_LIBRARIES_E "${CMAKE_CURRENT_LIST_DIR}/lib/x64/") else () - set(MAIN_LIBRARIES "${CMAKE_CURRENT_LIST_DIR}/lib/x86/soloud.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x86/SDL2.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x86/SDL2main.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x86/SDL2_image.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x86/SDL2_ttf.lib") + set(MAIN_LIBRARIES "${CMAKE_CURRENT_LIST_DIR}/lib/x86/soloud_static.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x86/SDL2.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x86/SDL2main.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x86/SDL2_image.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x86/SDL2_ttf.lib") set(MAIN_LIBRARIES_E "${CMAKE_CURRENT_LIST_DIR}/lib/x86/") endif () @@ -101,6 +101,6 @@ file(REMOVE_RECURSE "${BUILD_DIRECTORY}/SDL2_image.lib") file(REMOVE_RECURSE "${BUILD_DIRECTORY}/SDL2_ttf.lib") file(REMOVE_RECURSE "${BUILD_DIRECTORY}/SDL2main.lib") file(REMOVE_RECURSE "${BUILD_DIRECTORY}/SDL2test.lib") -file(REMOVE_RECURSE "${BUILD_DIRECTORY}/soloud.lib") +file(REMOVE_RECURSE "${BUILD_DIRECTORY}/soloud_static.lib") # :) \ No newline at end of file diff --git a/bin/bass.lib b/bin/bass.lib deleted file mode 100644 index ff345fd..0000000 Binary files a/bin/bass.lib and /dev/null differ diff --git a/bin/bass_fx.lib b/bin/bass_fx.lib deleted file mode 100644 index 5ad6fc8..0000000 Binary files a/bin/bass_fx.lib and /dev/null differ diff --git a/lib/SoLoud/SoLoud_Static.zip b/lib/SoLoud/SoLoud_Static.zip new file mode 100644 index 0000000..0b587a0 Binary files /dev/null and b/lib/SoLoud/SoLoud_Static.zip differ diff --git a/lib/SoLoud/x64/soloud_static.lib b/lib/SoLoud/x64/soloud_static.lib new file mode 100644 index 0000000..2e8caa7 Binary files /dev/null and b/lib/SoLoud/x64/soloud_static.lib differ diff --git a/lib/SoLoud/x86/soloud_static.lib b/lib/SoLoud/x86/soloud_static.lib new file mode 100644 index 0000000..a65b040 Binary files /dev/null and b/lib/SoLoud/x86/soloud_static.lib differ