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