1*1b8c19f4SYuri Dario--- misc/CoinMP-1.6.0/CoinUtils/src/CoinSignal.hpp 2014-08-27 13:57:26.000000000 +0200 2*1b8c19f4SYuri Dario+++ misc/build/CoinMP-1.6.0/CoinUtils/src/CoinSignal.hpp 2014-08-27 12:15:58.000000000 +0200 3*1b8c19f4SYuri Dario@@ -29,7 +29,7 @@ 4*1b8c19f4SYuri Dario 5*1b8c19f4SYuri Dario //----------------------------------------------------------------------------- 6*1b8c19f4SYuri Dario 7*1b8c19f4SYuri Dario-#if defined(__CYGWIN__) && defined(__GNUC__) 8*1b8c19f4SYuri Dario+#if defined(__CYGWIN__) && defined(__GNUC__) || defined(__KLIBC__) 9*1b8c19f4SYuri Dario typedef typeof(SIG_DFL) CoinSighandler_t; 10*1b8c19f4SYuri Dario # define CoinSighandler_t_defined 11*1b8c19f4SYuri Dario #endif 12*1b8c19f4SYuri Dario--- misc/CoinMP-1.6.0/CoinUtils/src/CoinTime.hpp 2011-01-04 00:31:00.000000000 +0100 13*1b8c19f4SYuri Dario+++ misc/build/CoinMP-1.6.0/CoinUtils/src/CoinTime.hpp 2014-08-27 12:58:06.000000000 +0200 14*1b8c19f4SYuri Dario@@ -23,6 +23,9 @@ 15*1b8c19f4SYuri Dario #include <sys/time.h> 16*1b8c19f4SYuri Dario #endif 17*1b8c19f4SYuri Dario #if !defined(__MSVCRT__) 18*1b8c19f4SYuri Dario+#ifdef __KLIBC__ 19*1b8c19f4SYuri Dario+#include <sys/types.h> 20*1b8c19f4SYuri Dario+#endif 21*1b8c19f4SYuri Dario #include <sys/resource.h> 22*1b8c19f4SYuri Dario #endif 23*1b8c19f4SYuri Dario #endif 24*1b8c19f4SYuri Dario@@ -121,6 +124,12 @@ 25*1b8c19f4SYuri Dario cpu_temp = (double)((double)ticksnow/CLOCKS_PER_SEC); 26*1b8c19f4SYuri Dario #endif 27*1b8c19f4SYuri Dario 28*1b8c19f4SYuri Dario+#elif defined(__KLIBC__) 29*1b8c19f4SYuri Dario+ 30*1b8c19f4SYuri Dario+ unsigned int ticksnow; /* clock_t is same as int */ 31*1b8c19f4SYuri Dario+ ticksnow = (unsigned int)clock(); 32*1b8c19f4SYuri Dario+ cpu_temp = (double)((double)ticksnow/CLOCKS_PER_SEC); 33*1b8c19f4SYuri Dario+ 34*1b8c19f4SYuri Dario #else 35*1b8c19f4SYuri Dario struct rusage usage; 36*1b8c19f4SYuri Dario # ifdef ZEROFAULT 37*1b8c19f4SYuri Dario@@ -141,7 +150,7 @@ 38*1b8c19f4SYuri Dario static inline double CoinSysTime() 39*1b8c19f4SYuri Dario { 40*1b8c19f4SYuri Dario double sys_temp; 41*1b8c19f4SYuri Dario-#if defined(_MSC_VER) || defined(__MSVCRT__) 42*1b8c19f4SYuri Dario+#if defined(_MSC_VER) || defined(__MSVCRT__) || defined(__KLIBC__) 43*1b8c19f4SYuri Dario sys_temp = 0.0; 44*1b8c19f4SYuri Dario #else 45*1b8c19f4SYuri Dario struct rusage usage; 46*1b8c19f4SYuri Dario@@ -161,7 +170,7 @@ 47*1b8c19f4SYuri Dario static inline double CoinCpuTimeJustChildren() 48*1b8c19f4SYuri Dario { 49*1b8c19f4SYuri Dario double cpu_temp; 50*1b8c19f4SYuri Dario-#if defined(_MSC_VER) || defined(__MSVCRT__) 51*1b8c19f4SYuri Dario+#if defined(_MSC_VER) || defined(__MSVCRT__) || defined(__KLIBC__) 52*1b8c19f4SYuri Dario cpu_temp = 0.0; 53*1b8c19f4SYuri Dario #else 54*1b8c19f4SYuri Dario struct rusage usage; 55*1b8c19f4SYuri Dario--- misc/CoinMP-1.6.0/CoinMP/src/Makefile.in 2011-08-07 17:09:46.000000000 +0200 56*1b8c19f4SYuri Dario+++ misc/build/CoinMP-1.6.0/CoinMP/src/Makefile.in 2014-08-28 00:29:22.000000000 +0200 57*1b8c19f4SYuri Dario@@ -20,6 +20,10 @@ 58*1b8c19f4SYuri Dario 59*1b8c19f4SYuri Dario # Author: Andreas Waechter IBM 2006-04-13 60*1b8c19f4SYuri Dario 61*1b8c19f4SYuri Dario+OS2_LA_NAME=CoinMP 62*1b8c19f4SYuri Dario+OS2_DLL_NAME=CoinMP 63*1b8c19f4SYuri Dario+OS2_DLL_OBJ=$(libCoinMP_la_OBJECTS:%.lo=%.o) 64*1b8c19f4SYuri Dario+OS2_DLL_LIBS=../../Cbc/src/.libs/CbcSolver.a ../../Cbc/src/.libs/Cbc.a ../../Cgl/src/.libs/Cgl.a ../../Clp/src/OsiClp/.libs/OsiClp.a ../../Clp/src/.libs/Clp.a ../../Osi/src/Osi/.libs/Osi.a ../../CoinUtils/src/.libs/CoinUtils.a -lstdc++ $(LIBS) 65*1b8c19f4SYuri Dario 66*1b8c19f4SYuri Dario srcdir = @srcdir@ 67*1b8c19f4SYuri Dario top_srcdir = @top_srcdir@ 68*1b8c19f4SYuri Dario@@ -547,7 +551,7 @@ 69*1b8c19f4SYuri Dario done 70*1b8c19f4SYuri Dario check-am: all-am 71*1b8c19f4SYuri Dario check: check-am 72*1b8c19f4SYuri Dario-all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h config_coinmp.h 73*1b8c19f4SYuri Dario+all-am: Makefile $(LTLIBRARIES) $(OS2_DLL_NAME).dll $(HEADERS) config.h config_coinmp.h 74*1b8c19f4SYuri Dario installdirs: 75*1b8c19f4SYuri Dario for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"; do \ 76*1b8c19f4SYuri Dario test -z "$$dir" || $(mkdir_p) "$$dir"; \ 77*1b8c19f4SYuri Dario@@ -656,3 +660,13 @@ 78*1b8c19f4SYuri Dario # Tell versions [3.59,3.63) of GNU make to not export all variables. 79*1b8c19f4SYuri Dario # Otherwise a system limit (for SysV at least) may be exceeded. 80*1b8c19f4SYuri Dario .NOEXPORT: 81*1b8c19f4SYuri Dario+ 82*1b8c19f4SYuri Dario+$(OS2_DLL_NAME).dll: lib$(OS2_LA_NAME).la 83*1b8c19f4SYuri Dario+ cp .libs/$(OS2_LA_NAME).a .libs/$(OS2_LA_NAME)_s.a 84*1b8c19f4SYuri Dario+ echo "LIBRARY $(OS2_DLL_NAME) INITINSTANCE TERMINSTANCE" > $(OS2_DLL_NAME).def 85*1b8c19f4SYuri Dario+ echo "DATA MULTIPLE" >> $(OS2_DLL_NAME).def 86*1b8c19f4SYuri Dario+ echo "EXPORTS" >> $(OS2_DLL_NAME).def 87*1b8c19f4SYuri Dario+ emxexp $(OS2_DLL_OBJ) >> $(OS2_DLL_NAME).def 88*1b8c19f4SYuri Dario+ gcc -g -Zbin-files -Zhigh-mem -Zomf -Zdll $(OS2_DLL_NAME).def -o $@ $(OS2_DLL_OBJ) $(OS2_DLL_LIBS) 89*1b8c19f4SYuri Dario+ emximp -o .libs/$(OS2_LA_NAME).a $(OS2_DLL_NAME).def 90*1b8c19f4SYuri Dario+ emximp -o .libs/$(OS2_LA_NAME).lib $(OS2_DLL_NAME).def 91