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