new builds

netlog/CMakeLists.txt

@@ -17,8 +17,6 @@ file(
 	source_files
 	src/*
 	include/*
-    #   ../../ys_proto/src/*
-    #../../ys_proto/include/*
 )
 
 #Déclaration de l'exécutable
@@ -27,8 +25,21 @@ add_executable(
 	${source_files}
 )
 
-target_link_libraries(
-        netlog
-        _ys_proto
-        pthread
-)
+if (FORCE_CPU STREQUAL "32bits")
+    add_definitions(                        -m32)
+    set(CMAKE_EXE_LINKER_FLAGS                "${CMAKE_EXE_LINKER_FLAGS} -m32")
+    set(CMAKE_SHARED_LIBRARY_C_FLAGS        "${CMAKE_SHARED_LIBRARY_C_FLAGS} -m32")
+    set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -m32")
+
+    target_link_libraries(netlog _ys_proto32 pthread)
+    set_target_properties(netlog PROPERTIES OUTPUT_NAME "netlog32")
+else (FORCE_CPU STREQUAL "32bits")
+    target_link_libraries(netlog _ys_proto pthread) 
+endif (FORCE_CPU STREQUAL "32bits") 
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+   message("Doing the Windows version!") 
+   include_directories("/usr/i486-mingw32/include")
+   set (LIBS ${LIBS}pthread)
+   target_link_libraries(netlog pthread)
+endif (CMAKE_SYSTEM_NAME STREQUAL "Windows")

netlog/build32bits

@@ -0,0 +1,3 @@
+cmake_clean
+cmake . -G "Unix Makefiles"  -DFORCE_CPU:STRING=32bits
+

netlog/buildwin32

@@ -0,0 +1,2 @@
+cmake_clean
+cmake -DCMAKE_TOOLCHAIN_FILE=toolchain_win.cmake

netlog/include/activity_message.h

@@ -1,12 +1,12 @@
 #ifndef ACTIVITY_MESS
 #define ACTIVITY_MESS
 
-#if defined (Win32)
-#  include <windows.h>
-#  define psleep(sec) Sleep ((sec) * 1000)
-#elif defined (__linux)
+#if defined (__linux)
 #  include <unistd.h>
 #  define psleep(sec) sleep ((sec))
+#else
+#  include <windows.h>
+#  define psleep(sec) Sleep ((sec) * 1000)    
 #endif
 
 void * send_activity_message(void * p_data);

netlog/src/activity_message.cpp

@@ -1,4 +1,4 @@
-#include "ys_proto/apps/activity_message.h"
+#include "activity_message.h"
 #include "ys_proto/serialization/header.h"
 #include "ys_proto/sockets/socketYS.h"
 

netlog/src/ysclient.cpp

@@ -1,11 +1,9 @@
 #include "ysclient.h"
 #include "ys_proto/serialization/includeAll.h"
-#include "ys_proto/debug.h"
-#include "ys_proto/apps/activity_message.h"
+//#include "ys_proto/debug.h"
+#include "activity_message.h"
 
-//#include "readPoly.h"
-
-//#include "xmlLog.h"
+#include <pthread.h>
 
 
 

netlog/toolchain_win.cmake

@@ -0,0 +1,14 @@
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(CMAKE_C_COMPILER   i486-mingw32-gcc)
+
+SET(CMAKE_RC_COMPILER  i486-mingw32-gcc)
+
+SET(CMAKE_CXX_COMPILER i486-mingw32-g++)
+
+# Define paths to search for libraries
+SET(CMAKE_FIND_ROOT_PATH /usr/i486-mingw32/)
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+
+# Don't search in native paths, just the specified root paths
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

sndmsg/CMakeLists.txt

@@ -14,8 +14,6 @@ file(
 	source_files
 	src/*
 	include/*
-    #   ../../ys_proto/src/*
-    #../../ys_proto/include/*
 )
 
 #Déclaration de l'exécutable
@@ -24,7 +22,15 @@ add_executable(
 	${source_files}
 )
 
-target_link_libraries(
-        ys-sndmsg
-        _ys_proto
-)
+if (FORCE_CPU STREQUAL "32bits")
+    add_definitions(                        -m32)
+    set(CMAKE_EXE_LINKER_FLAGS                "${CMAKE_EXE_LINKER_FLAGS} -m32")
+    set(CMAKE_SHARED_LIBRARY_C_FLAGS        "${CMAKE_SHARED_LIBRARY_C_FLAGS} -m32")
+    set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS} -m32")
+
+    target_link_libraries(ys-sndmsg _ys_proto32)
+    set_target_properties(ys-sndmsg PROPERTIES OUTPUT_NAME "ys-sndmsg32")
+else (FORCE_CPU STREQUAL "32bits")
+    target_link_libraries(ys-sndmsg _ys_proto)
+endif (FORCE_CPU STREQUAL "32bits") 
+