From 57d27736fe65aa25f8c03c790c11475cc06d1296 Mon Sep 17 00:00:00 2001 From: scuri Date: Wed, 23 Jun 2010 19:38:25 +0000 Subject: *** empty log message *** --- html/en/drv/xrender.html | 4 +- src/cd_freetype.mak | 2 +- src/config.mak | 2 +- src/tecmake.mak | 99 ++++++++++++++++++++++++++++-------------------- 4 files changed, 62 insertions(+), 45 deletions(-) diff --git a/html/en/drv/xrender.html b/html/en/drv/xrender.html index 21d9a48..202ec34 100644 --- a/html/en/drv/xrender.html +++ b/html/en/drv/xrender.html @@ -36,8 +36,8 @@ Also the libraries "Xrender" and "Xft" must be installed in your system. The XRender extension must be available in the X-Windows server for the driver to work.

-

Currently, pre-compiled binaries are available for Linux, Darwin -and FreeBSD54. It is not available for the systems we have with AIX, SunOS and +

Currently, pre-compiled binaries are available for Linux +and BSD. It is not available for the systems we have with AIX, SunOS and IRIX.

In CDLua it is not necessary any additional initialization, but the application must still be linked with the cdcontextplus.lib diff --git a/src/cd_freetype.mak b/src/cd_freetype.mak index 96b657c..0b440b2 100644 --- a/src/cd_freetype.mak +++ b/src/cd_freetype.mak @@ -41,6 +41,6 @@ ifneq ($(findstring bc5, $(TEC_UNAME)), ) FLAGS = -w-8004 endif -ifneq ($(findstring Darwin, $(TEC_UNAME)), ) +ifneq ($(findstring MacOS, $(TEC_UNAME)), ) DEFINES += DARWIN_NO_CARBON endif diff --git a/src/config.mak b/src/config.mak index 55fe472..a88e831 100644 --- a/src/config.mak +++ b/src/config.mak @@ -4,7 +4,7 @@ OPT = YES ifdef GTK_DEFAULT ifdef USE_X11 - # Build X11 version in Linux,Darwin,FreeBSD + # Build X11 version in Linux and BSD LIBNAME := $(LIBNAME)x11 else ifeq ($(findstring Win, $(TEC_SYSNAME)), ) diff --git a/src/tecmake.mak b/src/tecmake.mak index b165af6..f894aa9 100644 --- a/src/tecmake.mak +++ b/src/tecmake.mak @@ -122,7 +122,7 @@ endif # System Info .PHONY: sysinfo sysinfo: - @echo ''; echo 'Tecmake - System Info' + @echo ''; echo 'Tecmake: System Info' @echo 'TEC_SYSNAME = $(TEC_SYSNAME)' @echo 'TEC_SYSVERSION = $(TEC_SYSVERSION)' @echo 'TEC_SYSMINOR = $(TEC_SYSMINOR)' @@ -338,6 +338,9 @@ ifndef LINKER endif endif +ifdef NO_ECHO + ECHO:=@ +endif #---------------------------------# # LO and LOH Suffix @@ -744,13 +747,15 @@ endif ifdef USE_CD CDSUFX := override USE_X11 = Yes - ifdef USE_GDK - ifndef GTK_DEFAULT - CDSUFX := gdk - endif - else - ifdef GTK_DEFAULT - CDSUFX := x11 + ifdef USE_IUP3 + ifdef USE_GDK + ifndef GTK_DEFAULT + CDSUFX := gdk + endif + else + ifdef GTK_DEFAULT + CDSUFX := x11 + endif endif endif ifdef USE_STATIC @@ -948,9 +953,13 @@ ifeq ($(MAKETYPE), APP) else ifeq ($(NO_DYNAMIC), Yes) TARGET := $(TARGETDIR)/$(TARGETSLIBNAME) + else + ifeq ($(NO_STATIC), Yes) + TARGET := $(TARGETDIR)/$(TARGETDLIBNAME) else TARGET := $(TARGETDIR)/$(TARGETSLIBNAME) $(TARGETDIR)/$(TARGETDLIBNAME) endif + endif endif # OBJ: list of .o, without path @@ -996,14 +1005,18 @@ ifeq ($(MAKETYPE), APP) else ifeq ($(NO_DYNAMIC), Yes) tecmake: print-start directories static-lib + else + ifeq ($(NO_STATIC), Yes) + tecmake: print-start directories dynamic-lib else tecmake: print-start directories static-lib dynamic-lib endif + endif endif .PHONY: print-start print-start: - @echo ''; echo 'Tecmake - Starting [ $(TARGETNAME):$(TEC_UNAME) ]' + @echo ''; echo 'Tecmake: starting [ $(TARGETNAME):$(TEC_UNAME) ]' #---------------------------------# @@ -1013,8 +1026,9 @@ print-start: dynamic-lib: $(TARGETDIR)/$(TARGETDLIBNAME) $(TARGETDIR)/$(TARGETDLIBNAME) : $(LOHS) $(OBJS) $(EXTRADEPS) - $(LD) $(STDLDFLAGS) -o $@ $(OBJS) $(SLIB) $(LFLAGS) - @echo 'Tecmake - Dynamic Library ($@) Done.'; echo '' + @echo ''; echo Tecmake: linking $( $@ @echo "# Script generated automatically by tecmake v$(VERSION)" >> $@ @echo "# Remove the comment bellow to set the LD_LIBRARY_PATH if needed." >> $@ @@ -1096,45 +1113,45 @@ endif # Compilation Rules $(OBJDIR)/%.o: $(SRCDIR)/%.c - @echo Compiling $( $@ + @echo ''; echo Tecmake: generating $( $@ $(OBJROOT)/%$(LO_SUFFIX).lo: $(SRCLUADIR)/%.lua - @echo Compiling $( $(DEPEND) @which $(CPPC) 2> /dev/null 1>&2 ;\ if [ $$? -eq 0 ]; then \ - echo "Building dependencies... (can be slow)" ;\ + echo "Tecmake: Building Dependencies... (can be slow)" ;\ $(CPPC) $(DEPINCS) $(DEFINES) $(STDDEFS) -MM $(SOURCES) | \ sed -e '1,$$s/^\([^ ]\)/$$(OBJDIR)\/\1/' > $(DEPEND) ;\ else \ echo "" ;\ - echo "$(CPPC) not found. Dependencies can not be built." ;\ + echo "Tecmake: error, $(CPPC) not found. Dependencies can not be built." ;\ echo "Must set USE_NODEPEND=Yes." ;\ echo "" ;\ exit 1 ;\ -- cgit v1.2.3