build: fix fmod binaries, again

JoshParnell · Apr 26, 2021 · 9aa5214 · 9aa5214
1 parent c1c205e
commit 9aa5214
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,6 +46,7 @@ target_include_directories (phx PUBLIC "ext/include")
 target_include_directories (phx PUBLIC "ext/include/bullet")
 target_link_directories (phx PUBLIC "ext/lib/${PLATARCH}")
 
+set_target_properties (phx PROPERTIES PREFIX "lib")
 set_target_properties (phx PROPERTIES OUTPUT_NAME_DEBUG "phx${ARCH}d")
 set_target_properties (phx PROPERTIES OUTPUT_NAME_RELEASE "phx${ARCH}r")
 set_target_properties (phx PROPERTIES OUTPUT_NAME_RELWITHDEBINFO "phx${ARCH}")
@@ -76,8 +77,14 @@ if (WINDOWS)
   add_extlib (lz4 liblz4.lib liblz4.dll)
   add_extlib (lua51 lua51.lib lua51.dll)
   add_extlib (sdl2 SDL2.lib SDL2.dll)
-  add_extlib (fmod fmodL_vc.lib fmodL.dll)
-  add_extlib (fmodstudio fmodstudioL_vc.lib fmodstudioL.dll)
+
+  if (ARCH EQUAL "32")
+    add_extlib (fmod fmodL_vc.lib fmodL.dll)
+    add_extlib (fmodstudio fmodstudioL_vc.lib fmodstudioL.dll)
+  else ()
+    add_extlib (fmod fmodL64_vc.lib fmodL64.dll)
+    add_extlib (fmodstudio fmodstudioL64_vc.lib fmodstudioL64.dll)
+  endif ()
 
 elseif (LINUX)
 

diff --git a/ext/lib/win64/fmod.dll → ext/lib/win64/fmod64.dll b/ext/lib/win64/fmod.dll → ext/lib/win64/fmod64.dll
diff --git a/ext/lib/win64/fmod_vc.lib → ext/lib/win64/fmod64_vc.lib b/ext/lib/win64/fmod_vc.lib → ext/lib/win64/fmod64_vc.lib
diff --git a/ext/lib/win64/fmodL.dll → ext/lib/win64/fmodL64.dll b/ext/lib/win64/fmodL.dll → ext/lib/win64/fmodL64.dll
diff --git a/ext/lib/win64/fmodL_vc.lib → ext/lib/win64/fmodL64_vc.lib b/ext/lib/win64/fmodL_vc.lib → ext/lib/win64/fmodL64_vc.lib
diff --git a/ext/lib/win64/fmodstudio.dll → ext/lib/win64/fmodstudio64.dll b/ext/lib/win64/fmodstudio.dll → ext/lib/win64/fmodstudio64.dll
diff --git a/ext/lib/win64/fmodstudio_vc.lib → ext/lib/win64/fmodstudio64_vc.lib b/ext/lib/win64/fmodstudio_vc.lib → ext/lib/win64/fmodstudio64_vc.lib
diff --git a/ext/lib/win64/fmodstudioL.dll → ext/lib/win64/fmodstudioL64.dll b/ext/lib/win64/fmodstudioL.dll → ext/lib/win64/fmodstudioL64.dll
diff --git a/ext/lib/win64/fmodstudioL_vc.lib → ext/lib/win64/fmodstudioL64_vc.lib b/ext/lib/win64/fmodstudioL_vc.lib → ext/lib/win64/fmodstudioL64_vc.lib