From 2841e003940d02d7b0339edbb7024abd93b7571b Mon Sep 17 00:00:00 2001 From: scuri Date: Fri, 25 Jun 2010 05:58:52 +0000 Subject: *** empty log message *** --- html/en/guide.html | 5 +++++ src/Makefile | 10 ++++++++-- src/cd_freetype.mak | 1 + src/cd_ftgl.mak | 10 ++++++++++ src/cd_pdflib.mak | 4 ++++ src/cdcairo.mak | 4 ++++ src/cdcontextplus.mak | 3 +++ src/cdgl.mak | 10 ++++++++++ src/cdluacairo5.mak | 6 ++++++ src/cdluacontextplus5.mak | 6 ++++++ src/cdluagl5.mak | 6 ++++++ src/cdluaim5.mak | 7 +++++++ src/cdluapdf5.mak | 6 ++++++ src/cdpdf.mak | 4 ++++ src/config.mak | 16 +++++++++++----- src/make_uname | 4 ++++ 16 files changed, 95 insertions(+), 7 deletions(-) diff --git a/html/en/guide.html b/html/en/guide.html index b09e2a3..343ca65 100644 --- a/html/en/guide.html +++ b/html/en/guide.html @@ -103,12 +103,17 @@ the makefiles and projects expect the following directory tree:

-> Xrender Xft (system - UNIX) cdcairo* -> cairo-2 (system - Windows/UNIX) cdpdf -> pdflib (included as separate library) +cdgl -> opengl32 (system - Windows) + -> GL (system - UNIX) + -> ftgl (included as separate library) cdlua51 -> cd -> lua5.1 cdluaim51 -> cdlua51 -> imlua51 cdluapdf51 -> cdlua51 -> cdpdf +cdluagl51 -> cdlua51 + -> cdgl (*) In Windows, "cdwin" is called "cd". In Linux and BSD "cdgdk" is called "cd". diff --git a/src/Makefile b/src/Makefile index 3a00315..61ba490 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ -.PHONY: do_all cd_freetype cd cdx11 cdgdk cd_pdflib cdpdf cdcontextplus cdcairo cdlua3 cdluapdf3 cdlua5 cdluapdf5 cdluacontextplus5 cdluacairo5 cdluaim5 -do_all: cd_freetype cd cd_pdflib cdpdf cdlua5 cdluapdf5 cdluaim5 +.PHONY: do_all cd_freetype cd cdx11 cdgdk cd_pdflib cdpdf cdgl cdcontextplus cdcairo cdlua3 cdluapdf3 cdluagl3 cdlua5 cdluapdf5 cdluagl5 cdluacontextplus5 cdluacairo5 cdluaim5 +do_all: cd_freetype cd cd_pdflib cdpdf cdgl cdlua5 cdluapdf5 cdluagl5 cdluaim5 cd_freetype: @$(MAKE) --no-print-directory -f tecmake.mak MF=cd_freetype @@ -14,6 +14,8 @@ cd_pdflib: @$(MAKE) --no-print-directory -f tecmake.mak MF=cd_pdflib cdpdf: @$(MAKE) --no-print-directory -f tecmake.mak MF=cdpdf +cdgl: + @$(MAKE) --no-print-directory -f tecmake.mak MF=cdgl cdcontextplus: @$(MAKE) --no-print-directory -f tecmake.mak MF=cdcontextplus cdcairo: @@ -22,10 +24,14 @@ cdlua3: @$(MAKE) --no-print-directory -f tecmake.mak MF=cdlua3 cdluapdf3: @$(MAKE) --no-print-directory -f tecmake.mak MF=cdluapdf3 +cdluagl3: + @$(MAKE) --no-print-directory -f tecmake.mak MF=cdluagl3 cdlua5: @$(MAKE) --no-print-directory -f tecmake.mak MF=cdlua5 cdluapdf5: @$(MAKE) --no-print-directory -f tecmake.mak MF=cdluapdf5 +cdluagl5: + @$(MAKE) --no-print-directory -f tecmake.mak MF=cdluagl5 cdluacontextplus5: @$(MAKE) --no-print-directory -f tecmake.mak MF=cdluacontextplus5 cdluacairo5: diff --git a/src/cd_freetype.mak b/src/cd_freetype.mak index 0b440b2..1482d0d 100644 --- a/src/cd_freetype.mak +++ b/src/cd_freetype.mak @@ -42,5 +42,6 @@ ifneq ($(findstring bc5, $(TEC_UNAME)), ) endif ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + BUILD_DYLIB=Yes DEFINES += DARWIN_NO_CARBON endif diff --git a/src/cd_ftgl.mak b/src/cd_ftgl.mak index fa0833d..a8b56d0 100644 --- a/src/cd_ftgl.mak +++ b/src/cd_ftgl.mak @@ -61,3 +61,13 @@ endif ifneq ($(findstring cygw, $(TEC_UNAME)), ) LIBS = freetype-6 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 + endif + + BUILD_DYLIB=Yes +endif diff --git a/src/cd_pdflib.mak b/src/cd_pdflib.mak index a185d19..b1c2003 100644 --- a/src/cd_pdflib.mak +++ b/src/cd_pdflib.mak @@ -128,3 +128,7 @@ SRC := pdflib/pdflib/pdflib.c $(SRCPDFLIB) $(SRCPDCORE) $(SRCFLATE) $(SRCFONT) ifneq ($(findstring dll, $(TEC_UNAME)), ) SRC += cd_pdflib.rc endif + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + BUILD_DYLIB=Yes +endif diff --git a/src/cdcairo.mak b/src/cdcairo.mak index 5938193..52b3493 100644 --- a/src/cdcairo.mak +++ b/src/cdcairo.mak @@ -27,3 +27,7 @@ LIBS = pangocairo-1.0 cairo pango-1.0 gobject-2.0 glib-2.0 # Can NOT use USE_CAIRO because cdcairo.lib will be included for linking USE_CD = YES CD = .. + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + BUILD_DYLIB=Yes +endif diff --git a/src/cdcontextplus.mak b/src/cdcontextplus.mak index 9a49404..77434de 100644 --- a/src/cdcontextplus.mak +++ b/src/cdcontextplus.mak @@ -22,6 +22,9 @@ else INCLUDES = . sim drv freetype2 x11 endif +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + BUILD_DYLIB=Yes +endif USE_CD = YES CD = .. diff --git a/src/cdgl.mak b/src/cdgl.mak index 47b15e4..cd2c369 100644 --- a/src/cdgl.mak +++ b/src/cdgl.mak @@ -14,3 +14,13 @@ endif USE_OPENGL = YES USE_CD = YES CD = .. + +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 + endif + + BUILD_DYLIB=Yes +endif diff --git a/src/cdluacairo5.mak b/src/cdluacairo5.mak index 77963bc..7ed4c14 100644 --- a/src/cdluacairo5.mak +++ b/src/cdluacairo5.mak @@ -37,3 +37,9 @@ NO_LUALINK = Yes USE_CD = YES USE_CDLUA = YES CD = .. + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + USE_CDLUA:= + INCLUDES += ../include + LDIR = ../lib/$(TEC_UNAME) +endif diff --git a/src/cdluacontextplus5.mak b/src/cdluacontextplus5.mak index fb9fa11..eee24f0 100644 --- a/src/cdluacontextplus5.mak +++ b/src/cdluacontextplus5.mak @@ -27,3 +27,9 @@ NO_LUALINK = Yes USE_CD = YES USE_CDLUA = YES CD = .. + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + USE_CDLUA:= + INCLUDES += ../include + LDIR = ../lib/$(TEC_UNAME) +endif diff --git a/src/cdluagl5.mak b/src/cdluagl5.mak index a9077bc..51e635b 100644 --- a/src/cdluagl5.mak +++ b/src/cdluagl5.mak @@ -21,3 +21,9 @@ NO_LUALINK = Yes USE_CD = YES USE_CDLUA = YES CD = .. + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + USE_CDLUA:= + INCLUDES += ../include + LDIR = ../lib/$(TEC_UNAME) +endif diff --git a/src/cdluaim5.mak b/src/cdluaim5.mak index a169240..506eded 100644 --- a/src/cdluaim5.mak +++ b/src/cdluaim5.mak @@ -20,3 +20,10 @@ USE_IM = YES USE_IMLUA = YES NO_LUALINK = Yes CD = .. + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + USE_IMLUA:= + USE_CDLUA:= + INCLUDES += ../include $(IM)/include + LDIR = ../lib/$(TEC_UNAME) $(IM)/lib/$(TEC_UNAME) +endif diff --git a/src/cdluapdf5.mak b/src/cdluapdf5.mak index 913aeee..94e807e 100644 --- a/src/cdluapdf5.mak +++ b/src/cdluapdf5.mak @@ -21,3 +21,9 @@ NO_LUALINK = Yes USE_CD = YES USE_CDLUA = YES CD = .. + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + USE_CDLUA:= + INCLUDES += ../include + LDIR = ../lib/$(TEC_UNAME) +endif diff --git a/src/cdpdf.mak b/src/cdpdf.mak index f4e5b40..d06d207 100644 --- a/src/cdpdf.mak +++ b/src/cdpdf.mak @@ -10,3 +10,7 @@ LIBS = pdflib USE_CD = YES CD = .. + +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + BUILD_DYLIB=Yes +endif diff --git a/src/config.mak b/src/config.mak index c4d7a1e..9ebc2e8 100644 --- a/src/config.mak +++ b/src/config.mak @@ -66,13 +66,15 @@ ifdef USE_GDK USE_GTK = Yes CHECK_GTK = Yes LIBS = pangocairo-1.0 cairo - ifeq ($(findstring Win, $(TEC_SYSNAME)), ) - SRC += cairo/cdcairoprn_unix.c - INCLUDES += /usr/include/gtk-unix-print-2.0 - LIBS += freetype - else + ifneq ($(findstring Win, $(TEC_SYSNAME)), ) SRC += cairo/cdcairoprn_win32.c cdcairoemf.c LIBS += freetype6 + else + ifeq ($(findstring MacOS, $(TEC_UNAME)), ) + SRC += cairo/cdcairoprn_unix.c + INCLUDES += /usr/include/gtk-unix-print-2.0 + endif + LIBS += freetype endif else ifdef USE_X11 @@ -88,4 +90,8 @@ ifneq ($(findstring dll, $(TEC_UNAME)), ) SRC += cd.rc endif +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) + BUILD_DYLIB=Yes +endif + LDIR = ../lib/$(TEC_UNAME) diff --git a/src/make_uname b/src/make_uname index 40cae83..24addf4 100644 --- a/src/make_uname +++ b/src/make_uname @@ -1,15 +1,19 @@ #This builds all the libraries of the folder for 1 uname tecmake $1 MF=cd_freetype $2 $3 $4 $5 $6 $7 $8 +tecmake $1 MF=cd_ftgl $2 $3 $4 $5 $6 $7 $8 tecmake $1 USE_X11=Yes $2 $3 $4 $5 $6 $7 $8 tecmake $1 USE_GDK=Yes $2 $3 $4 $5 $6 $7 $8 tecmake $1 MF=cd_pdflib $2 $3 $4 $5 $6 $7 $8 tecmake $1 MF=cdpdf $2 $3 $4 $5 $6 $7 $8 +tecmake $1 MF=cdgl $2 $3 $4 $5 $6 $7 $8 #tecmake $1 MF=cdlua3 $2 $3 $4 $5 $6 $7 $8 #tecmake $1 MF=cdluapdf3 $2 $3 $4 $5 $6 $7 $8 +#tecmake $1 MF=cdluagl3 $2 $3 $4 $5 $6 $7 $8 tecmake $1 MF=cdlua5 $2 $3 $4 $5 $6 $7 $8 tecmake $1 MF=cdluaim5 $2 $3 $4 $5 $6 $7 $8 tecmake $1 MF=cdluapdf5 $2 $3 $4 $5 $6 $7 $8 +tecmake $1 MF=cdluagl5 $2 $3 $4 $5 $6 $7 $8 # XRender and Cairo are NOT available in AIX, IRIX and SunOS # It is available in Linux and BSD -- cgit v1.2.3