29 lines
1,011 B
Diff
29 lines
1,011 B
Diff
diff -up vmmlib-20111122svn540/Makefile.orig vmmlib-20111122svn540/Makefile
|
|
--- vmmlib-20111122svn540/Makefile.orig 2011-10-13 20:01:19.000000000 +0200
|
|
+++ vmmlib-20111122svn540/Makefile 2011-11-22 18:03:24.732308940 +0100
|
|
@@ -27,7 +27,15 @@ VMMLIB_UNIT_TESTS =\
|
|
|
|
VMMLIB_UNIT_TESTS_OBJECTS = ${VMMLIB_UNIT_TESTS:%.cpp=%.o}
|
|
|
|
-CXXFLAGS += -I. -Iinclude -Itests -include stdint.h
|
|
+CXXFLAGS += -I. -Iinclude -Itests -include stdint.h -include f2c.h -include f2c_fix.h
|
|
+
|
|
+LBITS := $(shell getconf LONG_BIT)
|
|
+ifeq ($(LBITS),64)
|
|
+ LIBDIR=$(DESTDIR)/usr/lib64
|
|
+else
|
|
+ LIBDIR=$(DESTDIR)/usr/lib
|
|
+endif
|
|
+LDFLAGS += -L$(LIBDIR)/atlas -u MAIN__
|
|
|
|
# Mac OS X specific stuff
|
|
# on mac we want to use the frameworks, not the unix style libs
|
|
diff --git a/tests/f2c_fix.h b/tests/f2c_fix.h
|
|
index 0e25758..6356519 100644
|
|
--- a/tests/f2c_fix.h
|
|
+++ b/tests/f2c_fix.h
|
|
@@ -0,0 +1,4 @@
|
|
+#define integer f2c_fix_integer
|
|
+#define uinteger f2c_fix_uinteger
|
|
+typedef int f2c_fix_integer;
|
|
+typedef unsigned int f2c_fix_uinteger;
|