lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
James R 2020-11-01 20:01:22 -08:00
parent a653406e7a 56d2290778
commit 998a10e8ad
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CMakeLists.txt
View File

@ -232,7 +232,7 @@ set(SRB2_CONFIG_HAVE_GME ON CACHE BOOL
set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL
"Enable OpenMPT support.") "Enable OpenMPT support.")
set(SRB2_CONFIG_HAVE_CURL ON CACHE BOOL set(SRB2_CONFIG_HAVE_CURL ON CACHE BOOL
"Enable curl support, used for downloading files via HTTP.") "Enable curl support.")
set(SRB2_CONFIG_HAVE_THREADS ON CACHE BOOL set(SRB2_CONFIG_HAVE_THREADS ON CACHE BOOL
"Enable multithreading support.") "Enable multithreading support.")
if(${CMAKE_SYSTEM} MATCHES Windows) if(${CMAKE_SYSTEM} MATCHES Windows)
@ -458,7 +458,7 @@ endif()
if(${SRB2_CONFIG_HAVE_CURL}) if(${SRB2_CONFIG_HAVE_CURL})
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES}) if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
set(CURL_FOUND ON) set(CURL_FOUND ON)
set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl) set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl/include)
if(${SRB2_SYSTEM_BITS} EQUAL 64) if(${SRB2_SYSTEM_BITS} EQUAL 64)
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl") set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl")
else() # 32-bit else() # 32-bit
@ -552,6 +552,7 @@ if(${SRB2_CONFIG_USEASM})
endif() endif()
set(SRB2_USEASM ON) set(SRB2_USEASM ON)
add_definitions(-DUSEASM) add_definitions(-DUSEASM)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse3 -mfpmath=sse")
else() else()
set(SRB2_USEASM OFF) set(SRB2_USEASM OFF)
add_definitions(-DNONX86 -DNORUSEASM) add_definitions(-DNONX86 -DNORUSEASM)

2
src/Makefile
View File

@ -277,7 +277,7 @@ OPTS += -DCOMPVERSION
ifndef NONX86 ifndef NONX86
ifndef GCC29 ifndef GCC29
ARCHOPTS?=-march=pentium ARCHOPTS?=-msse3 -mfpmath=sse
else else
ARCHOPTS?=-mpentium ARCHOPTS?=-mpentium
endif endif

2
src/sdl/CMakeLists.txt
View File

@ -272,7 +272,7 @@ if(${SDL2_FOUND})
endif() endif()
target_compile_definitions(SRB2SDL2 PRIVATE target_compile_definitions(SRB2SDL2 PRIVATE
-DDDIRECTFULLSCREEN -DHAVE_SDL -DDIRECTFULLSCREEN -DHAVE_SDL
) )
## strip debug symbols into separate file when using gcc. ## strip debug symbols into separate file when using gcc.