windows..

3 files changed, 9 insertions, 8 deletions

diff --git a/server/server/Makefile b/server/server/Makefile
index d3aa807..4de4db0 100644
--- a/server/server/Makefile
+++ b/server/server/Makefile
@@ -1,5 +1,5 @@
 all:
-	g++ -c *.cpp -I/usr/include -O2 -pipe -march=i686 -msse -fomit-frame-pointer
+	g++ -c *.cpp -I/usr/include -O2 -pipe -msse -fomit-frame-pointer
 	g++ -o core *.o -lssl -lcrypto -ldl -lboost_system-mt -lboost_date_time-mt -lboost_thread-mt -lboost_random-mt -lboost_filesystem-mt -lpthread -Wl,-O1 -s
 clean:
 	rm *.o
diff --git a/server/server/Makefile.mingw32 b/server/server/Makefile.mingw32
index a11dcbd..fdd04e1 100644
--- a/server/server/Makefile.mingw32
+++ b/server/server/Makefile.mingw32
@@ -1,9 +1,9 @@
 all:
 	i686-pc-mingw32-g++ -c *.cpp -I/home/sss/temp/mingw/usr/i686-pc-mingw32/include -O2 -pipe -march=i686 -msse -fomit-frame-pointer -DWIN32 -D_WIN32
-	i686-pc-mingw32-g++ -o core *.o -lssl -lcrypto -ldl -lboost_system-mt -lboost_date_time-mt -lboost_thread-mt -lboost_random-mt -lboost_filesystem-mt -lpthread -Wl,-O1 -s
+	i686-pc-mingw32-g++ -o core *.o -lssl -lcrypto -lboost_thread_win32-mt -lboost_system-mt -lboost_date_time-mt  -lboost_random-mt -lboost_filesystem-mt -lmswsock -lws2_32 -lgdi32 -lz -Wl,-O1 -s
 clean:
 	rm *.o
 
 clean-all: 
-	rm *.o *.dll
+	rm *.o *.exe
 
diff --git a/server/server/main.cpp b/server/server/main.cpp
index c4e3640..8dcf4e8 100644
--- a/server/server/main.cpp
+++ b/server/server/main.cpp
@@ -545,12 +545,13 @@ int main(int argc, char* argv[])
 		default:
 			break;
 		}
-#else
-	cfg_path = "./config";
-#endif
+
 
 	}
-#ifndef WIN32
+#else	
+	cfg_path = "./config";
+#endif
+#ifndef WIN32	
 	if(daemon) //going to background (only for unix-like systems now)
 	{
 		pid_t pid; 
@@ -594,7 +595,7 @@ int main(int argc, char* argv[])
     *logger << time_str() << ": main thread exception: " << e.what() << " (this is bad)\n";
 	logger->unlock();
   }
-  sleep(2);
+  boost::this_thread::sleep(boost::posix_time::seconds(2));
 	}
 
   return 0;