[simspark-svn] SF.net SVN: simspark:[145] trunk/spark

[<he...@us...>]

Revision: 145
          http://simspark.svn.sourceforge.net/simspark/?rev=145&view=rev
Author:   hedayat
Date:     2010-01-16 23:52:20 +0000 (Sat, 16 Jan 2010)

Log Message:
-----------
A temporary workaround to allow agentproxy to be compiled on Windows
Added third party libraries including ruby to the Windows installer

Modified Paths:
--------------
    trunk/spark/CMakeLists.txt
    trunk/spark/ChangeLog
    trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp

Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt	2010-01-16 23:45:06 UTC (rev 144)
+++ trunk/spark/CMakeLists.txt	2010-01-16 23:52:20 UTC (rev 145)
@@ -190,6 +190,35 @@
 install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/sparkconfig.h DESTINATION
     ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
 
+if (WIN32) # try to find and install third-party .dlls to lib/thirdparty directory
+       set(THLIBDIR ${LIBDIR}/thirdparty)
+	   
+       string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
+       if (EXISTS ${ODEDLL})
+              install(PROGRAMS ${ODEDLL} DESTINATION ${THLIBDIR})
+       endif (EXISTS ${ODEDLL})
+
+       install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${THLIBDIR}
+             FILES_MATCHING PATTERN "*.dll")
+
+       string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
+       if (EXISTS ${DevIL_DLL})
+              install(PROGRAMS ${DevIL_DLL} DESTINATION ${THLIBDIR})
+       endif (EXISTS ${DevIL_DLL})
+
+       string(REGEX REPLACE "(.*)/ruby.exe" "\\1/" RUBY_BINDIR "${RUBY_EXECUTABLE}")
+       install(DIRECTORY "${RUBY_BINDIR}"
+        	 DESTINATION ${THLIBDIR} FILES_MATCHING PATTERN "*.dll")
+
+       install(DIRECTORY "${FREETYPE_INCLUDE_DIR_ft2build}/../bin/"
+        	 DESTINATION ${THLIBDIR} FILES_MATCHING PATTERN "*.dll")
+
+       set(SDL_DLL "${SDL_INCLUDE_DIR}/../lib/sdl.dll")
+       if (EXISTS ${SDL_DLL})
+              install(PROGRAMS ${SDL_DLL} DESTINATION ${THLIBDIR})
+       endif (EXISTS ${SDL_DLL})
+endif (WIN32)
+
 ########### uninstall support ############
 CONFIGURE_FILE(
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"

Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog	2010-01-16 23:45:06 UTC (rev 144)
+++ trunk/spark/ChangeLog	2010-01-16 23:52:20 UTC (rev 145)
@@ -1,3 +1,13 @@
+2010-01-17  Hedayat Vatankhah  <he...@gr...>
+
+	* lib/oxygen/proxyserver/agentproxy.cpp: 
+	- added a temporary workaround to allow compilation under windows
+	
+	* CMakeLists.txt: 
+	- add required third party .dlls on windows to simspark rather than
+	  rcssserver3d, which will be installed in lib/thirdparty directory.
+	  ruby dlls will be included too.
+
 2010-01-01  Hedayat Vatankhah  <he...@gr...>
 
 	* lib/oxygen/proxyserver/proxyserver.h: 

Modified: trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp
===================================================================
--- trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp	2010-01-16 23:45:06 UTC (rev 144)
+++ trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp	2010-01-16 23:52:20 UTC (rev 145)
@@ -28,6 +28,12 @@
 #include <sys/socket.h>
 #endif
 
+#ifndef EAGAIN
+// FIXME: This is only a workaround, and doesn't work fine.
+#define EAGAIN 0
+#define MSG_DONTWAIT 0
+#endif
+
 using namespace oxygen;
 using namespace zeitgeist;
 using namespace std;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.