Reversing the last merge because I botched it.

1 files changed, 80 insertions, 95 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da116758f04..70187c091f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,23 +162,19 @@ IF(UNIX AND NOT APPLE)
 	FIND_PACKAGE(Freetype)
 	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
 
-
-	IF(WITH_PYTHON)
-		# No way to set py31. remove for now.
-		# FIND_PACKAGE(PythonLibs)
-		SET(PYTHON /usr)
-		SET(PYTHON_VERSION 3.1)
-		SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-		# SET(PYTHON_BINARY python) # not used yet
-		SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
-		SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
-	
-		# FIND_PACKAGE(PythonInterp) # not used yet
-		# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
-
-		SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
-	ENDIF(WITH_PYTHON)
-
+	# No way to set py31. remove for now.
+	# FIND_PACKAGE(PythonLibs)
+	SET(PYTHON /usr)
+	SET(PYTHON_VERSION 3.1)
+	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+	# SET(PYTHON_BINARY python) # not used yet
+	SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+	SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+  
+	# FIND_PACKAGE(PythonInterp) # not used yet
+	# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+  
+	SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
 	IF(WITH_SDL)
 		FIND_PACKAGE(SDL)
@@ -188,27 +184,23 @@ IF(UNIX AND NOT APPLE)
 		ENDIF(NOT SDL_FOUND)
 	ENDIF(WITH_SDL)
 
-	IF(WITH_OPENEXR)
-		SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
-		FIND_PATH(OPENEXR_INC
-			ImfXdr.h
-			PATHS
-			${OPENEXR}/include/OpenEXR
-			/usr/local/include/OpenEXR
-			/sw/include/OpenEXR
-			/opt/local/include/OpenEXR
-			/opt/csw/include/OpenEXR
-			/opt/include/OpenEXR
-		)
-		SET(OPENEXR_LIB Half IlmImf Iex Imath)
-	ENDIF(WITH_OPENEXR)
-
-	IF(WITH_FFMPEG)
-		SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
-		SET(FFMPEG_INC ${FFMPEG}/include)
-		SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
-		SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
-	ENDIF(WITH_FFMPEG)
+	SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
+	FIND_PATH(OPENEXR_INC
+		ImfXdr.h
+		PATHS
+		${OPENEXR}/include/OpenEXR
+		/usr/local/include/OpenEXR
+		/sw/include/OpenEXR
+		/opt/local/include/OpenEXR
+		/opt/csw/include/OpenEXR
+		/opt/include/OpenEXR
+	)
+	SET(OPENEXR_LIB Half IlmImf Iex Imath)
+
+	SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
+	SET(FFMPEG_INC ${FFMPEG}/include)
+	SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
+	SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
   
 	IF(WITH_FFTW3)
 		SET(FFTW3 /usr)
@@ -255,10 +247,6 @@ IF(UNIX AND NOT APPLE)
 	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		# BSD's dont use libdl.so
 		SET(LLIBS "${LLIBS} -ldl")
-
-		# binreloc is linux only
-		SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
-		SET(BINRELOC_INC ${BINRELOC}/include)
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 	IF(WITH_OPENMP)
@@ -279,7 +267,6 @@ IF(UNIX AND NOT APPLE)
 	INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
 ENDIF(UNIX AND NOT APPLE)
 
-
 IF(WIN32)
 
 	# this file is included anyway when building under Windows with cl.exe
@@ -292,19 +279,48 @@ IF(WIN32)
 		message("64 bit compiler detected.")
 		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
 	ENDIF(CMAKE_CL_64)
-	
-	ADD_DEFINITIONS(-DWIN32)
 
+	SET(PYTHON ${LIBDIR}/python)
+	SET(PYTHON_VERSION 3.1)
+	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+	# SET(PYTHON_BINARY python) # not used yet
+	SET(PYTHON_LIB python31)
+	SET(PYTHON_LIBPATH ${PYTHON}/lib)
+
+	IF(WITH_OPENAL)
+		SET(OPENAL ${LIBDIR}/openal)
+		SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+		SET(OPENAL_LIBRARY wrap_oal)
+		SET(OPENAL_LIBPATH ${OPENAL}/lib)
+	ENDIF(WITH_OPENAL)
+
+	IF(WITH_SNDFILE)
+		SET(SNDFILE ${LIBDIR}/sndfile)
+		SET(SNDFILE_INC ${SNDFILE}/include)
+		SET(SNDFILE_LIB libsndfile-1)
+		SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+	ENDIF(WITH_SNDFILE)
+  
 	SET(ICONV ${LIBDIR}/iconv)
 	SET(ICONV_INC ${ICONV}/include)
 	SET(ICONV_LIB iconv)
 	SET(ICONV_LIBPATH ${ICONV}/lib)
 
+	SET(QUICKTIME ${LIBDIR}/QTDevWin)
+	SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
+	SET(QUICKTIME_LIB qtmlClient)
+	SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
+
 	SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
 	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
 	SET(LIBSAMPLERATE_LIB libsamplerate)
 	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
+	SET(SDL ${LIBDIR}/sdl)
+	SET(SDL_INCLUDE_DIR ${SDL}/include)
+	SET(SDL_LIBRARY SDL)
+	SET(SDL_LIBPATH ${SDL}/lib)
+
 	SET(PNG "${LIBDIR}/png")
 	SET(PNG_INC "${PNG}/include")
 	SET(PNG_LIBPATH ${PNG}/lib)
@@ -315,43 +331,6 @@ IF(WIN32)
 
 	SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
-	IF(WITH_PYTHON)
-		SET(PYTHON ${LIBDIR}/python)
-		SET(PYTHON_VERSION 3.1)
-		SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
-		# SET(PYTHON_BINARY python) # not used yet
-		SET(PYTHON_LIB python31)
-		SET(PYTHON_LIBPATH ${PYTHON}/lib)
-	ENDIF(WITH_PYTHON)
-
-	IF(WITH_OPENAL)
-		SET(OPENAL ${LIBDIR}/openal)
-		SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-		SET(OPENAL_LIBRARY wrap_oal)
-		SET(OPENAL_LIBPATH ${OPENAL}/lib)
-	ENDIF(WITH_OPENAL)
-
-	IF(WITH_SNDFILE)
-		SET(SNDFILE ${LIBDIR}/sndfile)
-		SET(SNDFILE_INC ${SNDFILE}/include)
-		SET(SNDFILE_LIB libsndfile-1)
-		SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
-	ENDIF(WITH_SNDFILE)
-
-	IF(WITH_SDL)
-		SET(SDL ${LIBDIR}/sdl)
-		SET(SDL_INCLUDE_DIR ${SDL}/include)
-		SET(SDL_LIBRARY SDL)
-		SET(SDL_LIBPATH ${SDL}/lib)
-	ENDIF(WITH_SDL)
-
-	IF(WITH_QUICKTIME)
-		SET(QUICKTIME ${LIBDIR}/QTDevWin)
-		SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
-		SET(QUICKTIME_LIB qtmlClient)
-		SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
-	ENDIF(WITH_QUICKTIME)
-
 	IF(MSVC)
 		IF(CMAKE_CL_64)
 			SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
@@ -370,6 +349,8 @@ IF(WIN32)
 		SET(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
 		SET(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
 		SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+
+		ADD_DEFINITIONS(-DWIN32)
 		
 		IF(WITH_OPENMP)
 			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
@@ -476,19 +457,19 @@ IF(WIN32)
 	ELSE(MSVC) # MINGW
 		SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
 
-		SET(CMAKE_CXX_FLAGS                "-pipe -funsigned-char -fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags ")
-		SET(CMAKE_C_FLAGS                  "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags ")
+		SET(CMAKE_CXX_FLAGS                "-pipe -funsigned-char -fno-strict-aliasing -mwindows" CACHE STRING "Mingw C++ flags " FORCE)
+		SET(CMAKE_C_FLAGS                  "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags " FORCE)
 
-		SET(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g" CACHE STRING "Mingw debug C++ flags ")
-		SET(CMAKE_CXX_FLAGS_RELEASE        "   -O2" CACHE STRING "Mingw release C++ flags ")
-		SET(CMAKE_CXX_FLAGS_MINSIZEREL     "   -Os" CACHE STRING "Mingw minsize release C++ flags ")
-		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
+		SET(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g" CACHE STRING "Mingw debug C++ flags " FORCE)
+		SET(CMAKE_CXX_FLAGS_RELEASE        "   -O2" CACHE STRING "Mingw release C++ flags " FORCE)
+		SET(CMAKE_CXX_FLAGS_MINSIZEREL     "   -Os" CACHE STRING "Mingw minsize release C++ flags " FORCE)
+		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags " FORCE)
 
-		SET(CMAKE_C_FLAGS_DEBUG            "-O0 -g" CACHE STRING "Mingw debug C flags ")
-		SET(CMAKE_C_FLAGS_RELEASE          "-O2"    CACHE STRING "Mingw release C flags ")
-		SET(CMAKE_C_FLAGS_MINSIZEREL       "-Os"    CACHE STRING "Mingw minsize release C flags ")
-		SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
-		ADD_DEFINITIONS(-DFREE_WINDOWS)
+		SET(CMAKE_C_FLAGS_DEBUG            "-O0 -g" CACHE STRING "Mingw debug C flags " FORCE)
+		SET(CMAKE_C_FLAGS_RELEASE          "-O2"    CACHE STRING "Mingw release C flags " FORCE)
+		SET(CMAKE_C_FLAGS_MINSIZEREL       "-Os"    CACHE STRING "Mingw minsize release C flags " FORCE)
+		SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" CACHE STRING "Mingw release, debug C++ flags " FORCE)
+		ADD_DEFINITIONS(-DFREE_WINDOWS -DWIN32)
 		
 		IF(WITH_OPENMP)
 			SET(LLIBS "${LLIBS} -lgomp")
@@ -545,7 +526,7 @@ IF(WIN32)
 		IF(WITH_OPENEXR)
 			SET(OPENEXR ${LIBDIR}/gcc/openexr)
 			SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
-			SET(OPENEXR_LIB Half IlmImf Iex IlmThread)
+			SET(OPENEXR_LIB Half IlmImf Iex)
 			SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
 		ENDIF(WITH_OPENEXR)
 
@@ -570,7 +551,6 @@ IF(WIN32)
 
 ENDIF(WIN32)
 
-
 IF(APPLE)
 	IF(WITH_LIBS10.5)
 		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
@@ -749,6 +729,11 @@ IF(APPLE)
 
 ENDIF(APPLE)
 
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+	SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+	SET(BINRELOC_INC ${BINRELOC}/include)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
 
 # buildinfo
 IF(WITH_BUILDINFO)