summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscuri <scuri>2010-06-26 17:42:07 +0000
committerscuri <scuri>2010-06-26 17:42:07 +0000
commitf98c177b28e86c420ea45f039940c38ca8030d08 (patch)
treef9cee787e680861555e37b75b0e7cb2564b520eb
parent43e1ca2d2cca9fd0b5208ece3d5afc144897ae6b (diff)
*** empty log message ***
-rw-r--r--src/cd_freetype.mak4
-rw-r--r--src/cd_ftgl.mak8
-rw-r--r--src/cd_pdflib.mak4
-rw-r--r--src/cdcairo.mak4
-rw-r--r--src/cdcontextplus.mak4
-rw-r--r--src/cdgl.mak8
-rw-r--r--src/cdpdf.mak4
-rw-r--r--src/config.mak4
-rw-r--r--src/tecmake.mak7
9 files changed, 29 insertions, 18 deletions
diff --git a/src/cd_freetype.mak b/src/cd_freetype.mak
index 1482d0d..593c4bc 100644
--- a/src/cd_freetype.mak
+++ b/src/cd_freetype.mak
@@ -42,6 +42,8 @@ ifneq ($(findstring bc5, $(TEC_UNAME)), )
endif
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
- BUILD_DYLIB=Yes
+ ifneq ($(TEC_SYSMINOR), 4)
+ BUILD_DYLIB=Yes
+ endif
DEFINES += DARWIN_NO_CARBON
endif
diff --git a/src/cd_ftgl.mak b/src/cd_ftgl.mak
index 94fe5cd..7252615 100644
--- a/src/cd_ftgl.mak
+++ b/src/cd_ftgl.mak
@@ -65,11 +65,7 @@ ifneq ($(findstring cygw, $(TEC_UNAME)), )
endif
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
- ifeq ($(TEC_SYSMINOR), 5)
- #Darwin9 Only - OpenGL bug fix for Fink, when the message bellow appears
- # ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib
- LFLAGS=-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ ifneq ($(TEC_SYSMINOR), 4)
+ BUILD_DYLIB=Yes
endif
-
- BUILD_DYLIB=Yes
endif
diff --git a/src/cd_pdflib.mak b/src/cd_pdflib.mak
index b1c2003..e372519 100644
--- a/src/cd_pdflib.mak
+++ b/src/cd_pdflib.mak
@@ -130,5 +130,7 @@ ifneq ($(findstring dll, $(TEC_UNAME)), )
endif
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
- BUILD_DYLIB=Yes
+ ifneq ($(TEC_SYSMINOR), 4)
+ BUILD_DYLIB=Yes
+ endif
endif
diff --git a/src/cdcairo.mak b/src/cdcairo.mak
index 52b3493..9b1b171 100644
--- a/src/cdcairo.mak
+++ b/src/cdcairo.mak
@@ -29,5 +29,7 @@ USE_CD = YES
CD = ..
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
- BUILD_DYLIB=Yes
+ ifneq ($(TEC_SYSMINOR), 4)
+ BUILD_DYLIB=Yes
+ endif
endif
diff --git a/src/cdcontextplus.mak b/src/cdcontextplus.mak
index 77434de..e612452 100644
--- a/src/cdcontextplus.mak
+++ b/src/cdcontextplus.mak
@@ -23,7 +23,9 @@ else
endif
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
- BUILD_DYLIB=Yes
+ ifneq ($(TEC_SYSMINOR), 4)
+ BUILD_DYLIB=Yes
+ endif
endif
USE_CD = YES
diff --git a/src/cdgl.mak b/src/cdgl.mak
index 1bba4b0..800955e 100644
--- a/src/cdgl.mak
+++ b/src/cdgl.mak
@@ -28,11 +28,7 @@ ifneq ($(findstring SunOS, $(TEC_UNAME)), )
endif
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
- ifeq ($(TEC_SYSMINOR), 5)
- #Darwin9 Only - OpenGL bug fix for Fink, when the message bellow appears
- # ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib
- LFLAGS=-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ ifneq ($(TEC_SYSMINOR), 4)
+ BUILD_DYLIB=Yes
endif
-
- BUILD_DYLIB=Yes
endif
diff --git a/src/cdpdf.mak b/src/cdpdf.mak
index d06d207..8767c4c 100644
--- a/src/cdpdf.mak
+++ b/src/cdpdf.mak
@@ -12,5 +12,7 @@ USE_CD = YES
CD = ..
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
- BUILD_DYLIB=Yes
+ ifneq ($(TEC_SYSMINOR), 4)
+ BUILD_DYLIB=Yes
+ endif
endif
diff --git a/src/config.mak b/src/config.mak
index 855ad60..467f4f5 100644
--- a/src/config.mak
+++ b/src/config.mak
@@ -100,7 +100,9 @@ ifneq ($(findstring dll, $(TEC_UNAME)), )
endif
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
- BUILD_DYLIB=Yes
+ ifneq ($(TEC_SYSMINOR), 4)
+ BUILD_DYLIB=Yes
+ endif
endif
LDIR = ../lib/$(TEC_UNAME)
diff --git a/src/tecmake.mak b/src/tecmake.mak
index 39904c8..0d9109e 100644
--- a/src/tecmake.mak
+++ b/src/tecmake.mak
@@ -516,6 +516,13 @@ ifneq ($(findstring MacOS, $(TEC_UNAME)), )
else
STDLDFLAGS := -bundle -undefined dynamic_lookup
endif
+ ifdef USE_OPENGL
+ ifeq ($(TEC_SYSMINOR), 5)
+ #Darwin9 Only - OpenGL bug fix for Fink, when the message bellow appears
+ # ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib
+ LFLAGS += -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ endif
+ endif
endif
ifneq ($(findstring FreeBSD, $(TEC_UNAME)), )