Fix up 64-bit gme

2f62a03f · SteelT · 54b35c39 · 2f62a03f · 2f62a03f · 2f62a03f
Commit 2f62a03f authored 6 years ago by SteelT
--- a/bin/Resources/libgme64.dll
+++ b/bin/Resources/libgme64.dll
--- a/libs/gme/win64/libgme.dll.a
+++ b/libs/gme/win64/libgme.dll.a
--- a/objs/djgppdos/Debug/.gitignore
+++ b/objs/djgppdos/Debug/.gitignore
 /depend.dep
+/*.o
--- a/objs/djgppdos/Release/.gitignore
+++ b/objs/djgppdos/Release/.gitignore
 /depend.dep
+/*.o
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -321,7 +321,11 @@ if(${SRB2_CONFIG_HAVE_GME})
 	if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
 		set(GME_FOUND ON)
 		set(GME_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/gme/include)
-		set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win32 -lgme")
+        if(${SRB2_SYSTEM_BITS} EQUAL 64)
+			set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win64 -lgme")
+		else() # 32-bit
+			set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win32 -lgme")
+		endif()
 	else()
 		find_package(GME)
 	endif()