diff options
| author | scuri <scuri> | 2011-05-26 18:53:34 +0000 |
|---|---|---|
| committer | scuri <scuri> | 2011-05-26 18:53:34 +0000 |
| commit | 5304331058c0e0995b12118f8d312f9b4979e3ba (patch) | |
| tree | 6ea05bd6834146ace0a0598f183a53a6c515c996 | |
| parent | 37ca31ef29944fe35bf0bc90128e1d69a704a402 (diff) | |
*** empty log message ***
| -rw-r--r-- | src/cd_ftgl.mak | 4 | ||||
| -rw-r--r-- | src/cdgl.mak | 4 | ||||
| -rw-r--r-- | src/cdlua3.mak | 6 | ||||
| -rw-r--r-- | src/cdluagl3.mak | 6 | ||||
| -rw-r--r-- | src/cdluapdf3.mak | 6 | ||||
| -rw-r--r-- | src/drv/cdgl.c | 4 |
6 files changed, 30 insertions, 0 deletions
diff --git a/src/cd_ftgl.mak b/src/cd_ftgl.mak index 7252615..8bc27ac 100644 --- a/src/cd_ftgl.mak +++ b/src/cd_ftgl.mak @@ -65,6 +65,10 @@ ifneq ($(findstring cygw, $(TEC_UNAME)), ) endif ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + ifdef USE_MACOS_OPENGL + LFLAGS = -framework OpenGL + USE_OPENGL := + endif ifneq ($(TEC_SYSMINOR), 4) BUILD_DYLIB=Yes endif diff --git a/src/cdgl.mak b/src/cdgl.mak index 77f62f6..f59fd70 100644 --- a/src/cdgl.mak +++ b/src/cdgl.mak @@ -33,6 +33,10 @@ ifneq ($(findstring SunOS, $(TEC_UNAME)), ) endif ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + ifdef USE_MACOS_OPENGL + LFLAGS = -framework OpenGL + USE_OPENGL := + endif ifneq ($(TEC_SYSMINOR), 4) BUILD_DYLIB=Yes endif diff --git a/src/cdlua3.mak b/src/cdlua3.mak index cb809de..ee9bfe6 100644 --- a/src/cdlua3.mak +++ b/src/cdlua3.mak @@ -10,3 +10,9 @@ SRC = cdlua.c toluacd.c toluawd.c cdvoid.c cdluactx.c USE_LUA = YES USE_CD = YES CD = .. + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + ifneq ($(TEC_SYSMINOR), 4) + BUILD_DYLIB=Yes + endif +endif diff --git a/src/cdluagl3.mak b/src/cdluagl3.mak index e655afd..bc9301c 100644 --- a/src/cdluagl3.mak +++ b/src/cdluagl3.mak @@ -13,3 +13,9 @@ LIBS = cdlua3 cdgl LDIR = ../lib/$(TEC_UNAME) USE_LUA = YES + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + ifneq ($(TEC_SYSMINOR), 4) + BUILD_DYLIB=Yes + endif +endif diff --git a/src/cdluapdf3.mak b/src/cdluapdf3.mak index 70956da..126ac5d 100644 --- a/src/cdluapdf3.mak +++ b/src/cdluapdf3.mak @@ -13,3 +13,9 @@ LIBS = cdlua3 cdpdf LDIR = ../lib/$(TEC_UNAME) USE_LUA = YES + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + ifneq ($(TEC_SYSMINOR), 4) + BUILD_DYLIB=Yes + endif +endif diff --git a/src/drv/cdgl.c b/src/drv/cdgl.c index 7fe7ba2..deb7704 100644 --- a/src/drv/cdgl.c +++ b/src/drv/cdgl.c @@ -15,7 +15,11 @@ #include <iconv.h> #endif +#if defined (__APPLE__) || defined (OSX) +#include <OpenGL/gl.h> +#else #include <GL/gl.h> +#endif #include <FTGL/ftgl.h> |