diff options
| author | scuri <scuri> | 2010-06-26 17:41:58 +0000 |
|---|---|---|
| committer | scuri <scuri> | 2010-06-26 17:41:58 +0000 |
| commit | c315a7256b42812a13e80e3bc4a48a2dc1b7170d (patch) | |
| tree | 22dded321c10d3e39306caf36d400ba30cafc675 /src | |
| parent | 56d65290386cad2d27f01cef213046cb53bbd1fa (diff) | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.mak | 4 | ||||
| -rw-r--r-- | src/im_fftw.mak | 4 | ||||
| -rw-r--r-- | src/im_fftw3.mak | 4 | ||||
| -rw-r--r-- | src/im_jp2.mak | 4 | ||||
| -rw-r--r-- | src/im_process.mak | 4 | ||||
| -rw-r--r-- | src/tecmake.mak | 7 |
6 files changed, 22 insertions, 5 deletions
diff --git a/src/config.mak b/src/config.mak index c703951..cdcfa9d 100644 --- a/src/config.mak +++ b/src/config.mak @@ -143,5 +143,7 @@ ifneq ($(findstring HP-UX, $(TEC_UNAME)), ) endif ifneq ($(findstring MacOS, $(TEC_UNAME)), ) - BUILD_DYLIB=Yes + ifneq ($(TEC_SYSMINOR), 4) + BUILD_DYLIB=Yes + endif endif diff --git a/src/im_fftw.mak b/src/im_fftw.mak index a7cf53c..c309136 100644 --- a/src/im_fftw.mak +++ b/src/im_fftw.mak @@ -45,5 +45,7 @@ ifneq ($(findstring HP-UX, $(TEC_UNAME)), ) endif ifneq ($(findstring MacOS, $(TEC_UNAME)), ) - BUILD_DYLIB=Yes + ifneq ($(TEC_SYSMINOR), 4) + BUILD_DYLIB=Yes + endif endif diff --git a/src/im_fftw3.mak b/src/im_fftw3.mak index d23376f..12e2cc2 100644 --- a/src/im_fftw3.mak +++ b/src/im_fftw3.mak @@ -44,7 +44,9 @@ else DEFINES += HAVE_UINTPTR_T endif ifneq ($(findstring MacOS, $(TEC_UNAME)), ) - BUILD_DYLIB=Yes + ifneq ($(TEC_SYSMINOR), 4) + BUILD_DYLIB=Yes + endif DEFINES += HAVE_UINTPTR_T endif ifneq ($(findstring FreeBSD, $(TEC_UNAME)), ) diff --git a/src/im_jp2.mak b/src/im_jp2.mak index 4a1b720..49daa8e 100644 --- a/src/im_jp2.mak +++ b/src/im_jp2.mak @@ -45,7 +45,9 @@ else endif ifneq ($(findstring MacOS, $(TEC_UNAME)), ) - BUILD_DYLIB=Yes + ifneq ($(TEC_SYSMINOR), 4) + BUILD_DYLIB=Yes + endif endif USE_IM=Yes diff --git a/src/im_process.mak b/src/im_process.mak index 12a2dad..2bc94e9 100644 --- a/src/im_process.mak +++ b/src/im_process.mak @@ -34,6 +34,8 @@ else DEFINES += IM_DEFMATHFLOAT endif ifneq ($(findstring MacOS, $(TEC_UNAME)), ) - BUILD_DYLIB=Yes + ifneq ($(TEC_SYSMINOR), 4) + BUILD_DYLIB=Yes + endif endif endif 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)), ) |