- upravy par hlasek serveru sk->en

- v readme pridan popis instalace ze zdrojaku na win
- par kosmetickych uprav v cmakelists

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

4 files changed, 13 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c354a33..ef15a66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,10 @@
 # Created by Tomas Chvatal
 # volani se vsema externima moznostma:
 
-# cmake . -DServer=1 -DNO_Audio=1 -DDebug=1 -DCMAKE_C_FLAGS=-Wall -DDist=1"
+# cmake . -DServer=1 -DNO_Audio=1 -DDebug=1 -DCMAKE_C_FLAGS=-Wall -DWin=1"
 # make
 # make install
 
-# DDist=1 vyrobi binarku do adresare dist/ -> vhodne pro distribuci binarniho baliku...
 # !! pri zmene zdrojovych souboru se podivejte co je treba delat do souboru !!
 # !! CMakeLists.txt v adresari src !!
 SET ( APPNAME "tuxanci-ng")
@@ -70,20 +69,13 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 # nazev projektu
 PROJECT ( tuxanci )
-# verbose nastaveni vypnout pred release
-IF ( Dist )
-	SET ( CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/dist )
-	SET ( PREFIX \\"../\\" ) # tohle by melo vytvorit binarku s relativni path
-ENDIF ( Dist )
 IF ( Debug )
 	SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -Wall -pipe")
 	SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -pipe")
-#	SET ( CMAKE_VERBOSE_MAKEFILE on )
+	SET ( CMAKE_VERBOSE_MAKEFILE on )
 ENDIF ( Debug)
 MESSAGE ( "EXTRA Cflags:${CMAKE_C_FLAGS}" )
 MESSAGE ( "EXTRA CXXflags:${CMAKE_CXX_FLAGS}" )
-# pouzite podadresare
-# nestarame se o adresare s daty
 MESSAGE ( STATUS "<Compiling SRC>" )
 MESSAGE ( STATUS "<******************************>" )
 ADD_SUBDIRECTORY ( src )
@@ -92,11 +84,6 @@ ADD_SUBDIRECTORY ( src )
 #MESSAGE(STATUS "<******************************>")
 #ADD_SUBDIRECTORY ( lang )
 
-# instalace
-# data !TODO
-#MESSAGE ( STATUS "<Installing datafiles>" )
-#MESSAGE ( STATUS "<******************************>" )
-
 SET ( CMAKE_INSTALL_DATADIR share/ )
 IF ( NOT Win )
 	SET ( CMAKE_INSTALL_ETCDIR /etc )
diff --git a/README b/README
index 1b65b3e..0cd873e 100644
--- a/README
+++ b/README
@@ -73,6 +73,12 @@ HOWTO COMPILE
 		# make uninstall
 	Notes
 	-----
+		Compilation on windows is little bit tricky. You need MinGW
+		<http://www.mingw.org/> and CMake <http://www.cmake.org/>. Then follow
+		those steps above. Only add cmake option -G "MinGW Makefiles". If cmd
+		say that no make.exe command found you need to use absolute path. Do
+		not specify PREFIX!!
+		
 		Option -DNO_AUDIO=1 says we want no audio support for client so change
 		if you want so.
 		
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af854ea..d182c7a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,6 +33,9 @@ ENDIF ( Server )
 IF ( PREFIX )
 	ADD_DEFINITIONS ( -DPREFIX="${PREFIX}" )
 ENDIF ( PREFIX )
+IF ( Win AND NOT Server )
+	ADD_DEFINITIONS ( -mwindows )
+ENDIF ( Win AND NOT Server )
 #include zdrojaku
 INCLUDE_DIRECTORIES ( ${WORKDIR}/base )
 INCLUDE_DIRECTORIES ( ${WORKDIR}/net )
diff --git a/src/server/publicServer.c b/src/server/publicServer.c
index a0cedfe..315fdd2 100644
--- a/src/server/publicServer.c
+++ b/src/server/publicServer.c
@@ -262,7 +262,7 @@ int initPublicServer()
 
 	if( ret < 0 )
 	{
-		printf("Nemozem inicalizovat sietovy socket !\n");
+		printf("Unable to initialize network socket!\n");
 		return -1;
 	}
 
@@ -270,7 +270,7 @@ int initPublicServer()
 
 	if (registerPublicServer() < 0)
 	{
-		printf("Nemuzu kontaktovat master server !\n");
+		printf("Unable to contact MasterServer!\n");
 	}
 
 	return 0;