- hratky s cmakelists

- pridano hardcoded path pro sdl na win
- vypise uzivateli kde je ocekava...
- uzivatel muze prepsat ze...

git-svn-id: http://opensvn.csie.org/tuxanci_ng@134 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

4 files changed, 45 insertions, 14 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63084e8..75435e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,9 @@ MESSAGE ( "Configure for ${APPNAME} Started" )
 MESSAGE ( "<******************************>" )
 CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 )
 CMAKE_MINIMUM_REQUIRED ( VERSION 2.4.6 FATAL_ERROR )
+IF ( COMMAND cmake_policy )
+	cmake_policy( SET CMP0003 NEW )
+ENDIF ( COMMAND cmake_policy )
 #OSX
 #SET ( CMAKE_OSX_ARCHITECTURES ppc i386 )
 #CMAKE_OSX_SYSROOT
@@ -26,6 +29,26 @@ IF ( Apple )
 		CACHE_INTERNAL "OSX Architectures" FORCE
 	)
 ENDIF ( Apple )
+IF ( Win )
+	# budeme pocitat s tim ze uzivatel ma vse v C:\MinGW\lib ...
+	# tise predpokladame ze s automatikou chce MinGW only, jinak si to bude muset nastavit rucne...
+	MESSAGE ( "<******************************>" )
+	MESSAGE ( "Configuring with hardcoded path for sdl:" )
+	MESSAGE ( "C:/MinGW/lib/SDL.dll" )
+	MESSAGE ( "C:/MinGW/lib/SDL_image.dll" )
+	MESSAGE ( "C:/MinGW/lib/SDL_mixer.dll" )
+	MESSAGE ( "C:/MinGW/lib/SDL_ttf.dll" )
+	MESSAGE ( "C:/MinGW/include/SDL" )
+	MESSAGE ( "<******************************>" )
+	SET ( SDL_LIBRARY "C:/MinGW/lib/SDL.dll" )
+	SET ( SDLMIXER_LIBRARY "C:/MinGW/lib/SDL_mixer.dll" )
+	SET ( SDLTTF_LIBRARY "C:/MinGW/lib/SDL_ttf.dll" )
+	SET ( SDLIMAGE_LIBRARY "C:/MinGW/lib/SDL_image.dll" )
+	SET ( SDL_INCLUDE_DIR "C:/MinGW/include/SDL" )
+	SET ( SDLMIXER_INCLUDE_DIR "C:/MinGW/include/SDL" )
+	SET ( SDLIMAGE_INCLUDE_DIR "C:/MinGW/include/SDL" )
+	SET ( SDLTTF_INCLUDE_DIR "C:/MinGW/include/SDL" )
+ENDIF ( Win )
 SET ( CMAKE_COLOR_MAKEFILE ON )
 ## balickovani 
 SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README" )
diff --git a/config.h b/config.h
index dd0977c..a8c339d 100644
--- a/config.h
+++ b/config.h
@@ -1 +1 @@
-#define TUXANCI_NG_VERSION "svn133"
+#define TUXANCI_NG_VERSION "svn134"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a27c29..538b3a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,11 +41,13 @@ SET ( CMAKE_INSTALL_BINDIR bin )
 SET ( CMAKE_INSTALL_LIBDIR lib )
 ADD_SUBDIRECTORY ( modules )
 IF ( NOT Server ) # server nebo klient
-	MESSAGE ( STATUS "<Checking for SDL>" )
-	MESSAGE ( STATUS "<******************************>" )
-	FIND_PACKAGE ( SDL REQUIRED )
-	FIND_PACKAGE ( SDL_image REQUIRED )
-	FIND_PACKAGE ( SDL_ttf REQUIRED )
+	IF ( NOT Win )
+		MESSAGE ( STATUS "<Checking for SDL>" )
+		MESSAGE ( STATUS "<******************************>" )
+		FIND_PACKAGE ( SDL REQUIRED )
+		FIND_PACKAGE ( SDL_image REQUIRED )
+		FIND_PACKAGE ( SDL_ttf REQUIRED )
+	ENDIF ( NOT Win )
 	LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain )
 	MESSAGE ( STATUS "<Building client as requested>" )
 	MESSAGE ( STATUS "<******************************>" )
@@ -59,9 +61,11 @@ IF ( NOT Server ) # server nebo klient
 		MESSAGE ( STATUS "<******************************>" )
 		SET ( SRC_compile ${SRC_base} ${SRC_client} ${SRC_audio} )
 		INCLUDE_DIRECTORIES ( ${WORKDIR}/audio )
-		FIND_PACKAGE ( SDL_mixer REQUIRED )
+		IF ( NOT Win )
+			FIND_PACKAGE ( SDL_mixer REQUIRED )
+		ENDIF ( NOT Win )
 		INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} )
-		LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain )
+		LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain )
 	ELSE (NOT NO_Audio)
 		MESSAGE ( STATUS "<Building without audio as requested>" )
 		ADD_DEFINITIONS ( -DNO_SOUND )
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 02d7d99..9c2c09a 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -4,18 +4,22 @@ IF ( NOT Server )
 	INCLUDE_DIRECTORIES ( ${WORKDIR}/client )
 	INCLUDE_DIRECTORIES ( ${WORKDIR}/screen )
 	INCLUDE_DIRECTORIES ( ${WORKDIR}/widget )
-	FIND_PACKAGE ( SDL REQUIRED )
-	FIND_PACKAGE ( SDL_image REQUIRED )
-	FIND_PACKAGE ( SDL_ttf REQUIRED )
+	IF ( NOT Win )
+		FIND_PACKAGE ( SDL REQUIRED )
+		FIND_PACKAGE ( SDL_image REQUIRED )
+		FIND_PACKAGE ( SDL_ttf REQUIRED )
+	ENDIF ( NOT Win )
 	INCLUDE_DIRECTORIES ( ${SDL_INCLUDE_DIR} ${SDLIMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} )
 	IF ( NOT NO_Audio )
 		INCLUDE_DIRECTORIES ( ${WORKDIR}/audio )
-		FIND_PACKAGE ( SDL_mixer REQUIRED )
+		IF ( NOT Win )
+			FIND_PACKAGE ( SDL_mixer REQUIRED )
+		ENDIF ( NOT Win )
 		INCLUDE_DIRECTORIES ( ${SDLMIXER_INCLUDE_DIR} )
-		LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain )
+		LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} SDLmain )
 	ELSE (NOT NO_Audio)
 		ADD_DEFINITIONS ( -DNO_SOUND )
-		LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLTTF_LIBRARY} SDLmain )
+		LINK_LIBRARIES ( ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} SDLmain )
 	ENDIF ( NOT NO_Audio )
 ELSE ( NOT Server )
 	LINK_LIBRARIES ( ${CMAKE_DL_LIBS} )