提交: 3f692a003efe3ae786b4ca43ff2d60a57b579e45 - zandronum-cluster (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG), Euroboros (EB), and Down Under Doomers (DUD).

Commit MetaInfo

• 修订版: 3f692a003efe3ae786b4ca43ff2d60a57b579e45 (tree)
• 时间: 2015-08-03 04:28:50
• 作者: Benjamin Berkels <torr.samaho@quan...>
• Commiter: Benjamin Berkels

Log Message

Merged with G1.9pre-439-g7954263

更改概述

• modified: CMakeLists.txt
• modified: src/CMakeLists.txt
• modified: tools/updaterevision/CMakeLists.txt

差异

diff -r 2d3e824a5055 -r 3f692a003efe CMakeLists.txt
--- a/CMakeLists.txt	Sun Aug 02 19:39:57 2015 +0200
+++ b/CMakeLists.txt	Sun Aug 02 21:28:50 2015 +0200
@@ -151,6 +151,11 @@
 	string(REPLACE "/MD " " " CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO} )
 	string(REPLACE "/MDd " " " CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG} )
 	string(REPLACE " /GR" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
+else( MSVC )
+	set( REL_LINKER_FLAGS "" )
+	set( ALL_C_FLAGS "" )
+	set( REL_C_FLAGS "" )
+	set( DEB_C_FLAGS "" )
 endif( MSVC )
 
 set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${REL_LINKER_FLAGS}" )

diff -r 2d3e824a5055 -r 3f692a003efe src/CMakeLists.txt
--- a/src/CMakeLists.txt	Sun Aug 02 19:39:57 2015 +0200
+++ b/src/CMakeLists.txt	Sun Aug 02 21:28:50 2015 +0200
@@ -57,6 +57,20 @@
 	"15" "14" "13" "12" "11" "10" "09" "08" "07" "06" "05" "04" "03"
 	"02" "01" "00" )
 set( MAJOR_VERSIONS "44" "34" "28" "26" "24" "22" "20" )
+
+if( NOT FMOD_DIR_VERSIONS )
+	set( FMOD_DIR_VERSIONS "" )
+endif( NOT FMOD_DIR_VERSIONS )
+if( NOT FMOD_VERSIONS )
+	set( FMOD_VERSIONS "" )
+endif( NOT FMOD_VERSIONS )
+if( NOT FMOD_LOCAL_INC_DIRS )
+	set( FMOD_LOCAL_INC_DIRS "" )
+endif( NOT FMOD_LOCAL_INC_DIRS )
+if( NOT FMOD_LOCAL_LIB_DIRS )
+	set( FMOD_LOCAL_LIB_DIRS "" )
+endif( NOT FMOD_LOCAL_LIB_DIRS )
+
 set( FMOD_DIR_VERSIONS ${FMOD_DIR_VERSIONS} "../fmod" )
 foreach( majver ${MAJOR_VERSIONS} )
 	foreach( minver ${MINOR_VERSIONS} )
@@ -69,6 +83,10 @@
 	endforeach( dir ${FMOD_DIR_VERSIONS} )
 endforeach( majver ${MAJOR_VERSIONS} )
 
+if( NOT ZDOOM_LIBS )
+	set( ZDOOM_LIBS "" )
+endif( NOT ZDOOM_LIBS )
+
 if( WIN32 )
 	if( X64 )
 		set( WIN_TYPE Win64 )
@@ -403,12 +421,16 @@
 	endif( UNIX )
 	if( WIN32 )
 		set( FIXRTEXT fixrtext )
+	else( WIN32 )
+		set( FIXRTEXT "" )
 	endif( WIN32 )
 	message( STATUS "Selected assembler: ${ASSEMBLER}" )
 	MACRO( ADD_ASM_FILE indir infile )
 		set( ASM_OUTPUT_${infile} "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/zdoom.dir/${indir}/${infile}${ASM_OUTPUT_EXTENSION}" )
 		if( WIN32 )
 			set( FIXRTEXT_${infile} COMMAND ${FIXRTEXT} "${ASM_OUTPUT_${infile}}" )
+		else( WIN32 )
+			set( FIXRTEXT_${infile} COMMAND "" )
 		endif( WIN32 )
 		add_custom_command( OUTPUT ${ASM_OUTPUT_${infile}}
 			COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/zdoom.dir/${indir}
@@ -712,6 +734,9 @@
 if( NO_ASM )
 	add_definitions( -DNOASM )
 else( NO_ASM )
+	if( NOT ASM_SOURCES )
+		set( ASM_SOURCES "" )
+	endif( NOT ASM_SOURCES )
 	if( X64 )
 		ADD_ASM_FILE( asm_x86_64 tmap3 )
 	else( X64 )

diff -r 2d3e824a5055 -r 3f692a003efe tools/updaterevision/CMakeLists.txt
--- a/tools/updaterevision/CMakeLists.txt	Sun Aug 02 19:39:57 2015 +0200
+++ b/tools/updaterevision/CMakeLists.txt	Sun Aug 02 21:28:50 2015 +0200
@@ -15,6 +15,8 @@
 			set( TRUSTINFO trustinfo.rc )
 		endif( MSVC_VERSION GREATER 1399 )
 	endif( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
+else( WIN32 )
+	set( TRUSTINFO "" )
 endif( WIN32 )
 
 if( NOT CMAKE_CROSSCOMPILING )