stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 05:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix up 64-bit gme

Browse source
This commit is contained in:
Steel Titanium 2018-10-30 20:50:36 -04:00
parent 54b35c3975
commit 2f62a03f6c
5 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bin/Resources/libgme64.dll Normal file
View file

Binary file not shown.

BIN
libs/gme/win64/libgme.dll.a Normal file
View file

Binary file not shown.

1
objs/djgppdos/Debug/.gitignore vendored
View file

@ -1 +1,2 @@
/depend.dep /depend.dep
/*.o

1
objs/djgppdos/Release/.gitignore vendored
View file

@ -1 +1,2 @@
/depend.dep /depend.dep
/*.o

6
src/CMakeLists.txt
View file

@ -321,7 +321,11 @@ if(${SRB2_CONFIG_HAVE_GME})
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
set(GME_FOUND ON) set(GME_FOUND ON)
set(GME_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/gme/include) 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() else()
find_package(GME) find_package(GME)
endif() endif()