From b329a34a583933394788bd464ffaddfb0375f169 Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edo88@email.it>
Date: Fri, 17 Jan 2014 23:36:59 +0100
Subject: [PATCH 1/2] - Fixed some cmake --warn-uninitialized messages

---
 CMakeLists.txt                      |  5 +++++
 src/CMakeLists.txt                  | 25 +++++++++++++++++++++++++
 tools/updaterevision/CMakeLists.txt |  2 ++
 3 files changed, 32 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0858ecab5..c30fd1b58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,11 @@ if( MSVC )
 	string(REPLACE "/MD " " " CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL} )
 	string(REPLACE "/MD " " " CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO} )
 	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 --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54a72aeae..b83b6dae6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,6 +50,20 @@ set( MINOR_VERSIONS "50" "49" "48" "47" "46" "45" "44" "43" "42" "41"
 	"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} )
@@ -62,6 +76,10 @@ foreach( majver ${MAJOR_VERSIONS} )
 	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 )
@@ -346,12 +364,16 @@ if( NOT NO_ASM )
 	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}
@@ -567,6 +589,9 @@ endif( WIN32 )
 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 --git a/tools/updaterevision/CMakeLists.txt b/tools/updaterevision/CMakeLists.txt
index d985b9e3f..be6167f94 100644
--- a/tools/updaterevision/CMakeLists.txt
+++ b/tools/updaterevision/CMakeLists.txt
@@ -15,6 +15,8 @@ if( WIN32 )
 			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 )
 
 add_executable( updaterevision updaterevision.c ${TRUSTINFO} )

From 70717cd2fab2183ce27e7eedfc03e77806d76d24 Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edo88@email.it>
Date: Sat, 18 Jan 2014 02:21:49 +0100
Subject: [PATCH 2/2] - Cover the ASM_SOURCES fix for NO_ASM users too

---
 src/CMakeLists.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b83b6dae6..badd2c3b1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -586,12 +586,13 @@ else( WIN32 )
 	endif( APPLE )
 endif( WIN32 )
 
+if( NOT ASM_SOURCES )
+	set( ASM_SOURCES "" )
+endif( NOT ASM_SOURCES )
+
 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 )