From e47790b44bf8580ba48aad3313e1c64d791b7025 Mon Sep 17 00:00:00 2001 From: scuri Date: Wed, 27 Jan 2010 02:27:20 +0000 Subject: *** empty log message *** --- html/en/download.html | 4 ++-- html/en/download_tips.html | 17 +++++++++++------ src/config.mak | 6 +++--- src/make_uname.bat | 2 +- src/pdflib/pdcore/pc_file.c | 6 +++++- src/tecmake_compact.mak | 16 ++++++++++++---- 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/html/en/download.html b/html/en/download.html index 4779cc1..d24fb87 100644 --- a/html/en/download.html +++ b/html/en/download.html @@ -19,8 +19,8 @@ http://sourceforge.net/projects/canvasdraw/files/

Use this link for the latest version: - -http://sourceforge.net/projects/canvasdraw/files/5.2/

+ +http://sourceforge.net/projects/canvasdraw/files/5.3/

Before downloading any precompiled binaries, you should read before the Tecgraf Library Download Tips.

diff --git a/html/en/download_tips.html b/html/en/download_tips.html index c80dbf9..1241bcd 100644 --- a/html/en/download_tips.html +++ b/html/en/download_tips.html @@ -40,15 +40,20 @@ can be found at http://www.tecgraf.puc-rio.br/tecmake.

The IM files can be downloaded at -http://sourceforge.net/project/showfiles.php?group_id=241318.
+ +http://sourceforge.net/projects/imtoolkit/files/.
The CD files can be downloaded at - -http://sourceforge.net/project/showfiles.php?group_id=241317.
+ +http://sourceforge.net/projects/canvasdraw/files/.
The IUP files can be downloaded at - -http://sourceforge.net/project/showfiles.php?group_id=241310.
+ +http://sourceforge.net/projects/iup/files/.
The Lua files can be downloaded at -http://luaforge.net/project/showfiles.php?group_id=110.

+http://luaforge.net/project/showfiles.php?group_id=110 +
+                                                +or at  +http://sourceforge.net/projects/luabinaries/files/.

Build Configuration

Libraries and executables were built using speed optimization. In UNIX the dynamic libraries were NOT built with the -fpic parameter. In MacOS X the dynamic libraries are in bundle format. The source code along with the diff --git a/src/config.mak b/src/config.mak index a46b5b3..e9ba19a 100644 --- a/src/config.mak +++ b/src/config.mak @@ -37,8 +37,8 @@ SRC = $(SRCCOMM) $(SRCSVG) $(SRCINTCGM) $(SRCDRV) $(SRCSIM) ifneq ($(findstring Win, $(TEC_SYSNAME)), ) ifdef USE_GDK - SRC += $(SRCGDK) - LIBNAME = cdgdk + SRC += $(SRCGDK) $(SRCNULL) + LIBNAME := cdgdk USE_GTK = Yes else SRC += $(SRCWIN32) @@ -47,7 +47,7 @@ ifneq ($(findstring Win, $(TEC_SYSNAME)), ) else ifdef USE_GDK SRC += $(SRCGDK) - LIBNAME = cdgdk + LIBNAME := cdgdk USE_GTK = Yes else SRC += $(SRCX11) diff --git a/src/make_uname.bat b/src/make_uname.bat index 7ac2147..6d84df8 100644 --- a/src/make_uname.bat +++ b/src/make_uname.bat @@ -6,7 +6,7 @@ if "%1"=="vc-all" goto all-vc call tecmake %1 "MF=cd_freetype" %2 %3 %4 %5 %6 %7 %8 call tecmake %1 %2 %3 %4 %5 %6 %7 %8 -call tecmake %1 "USE_GDK=Yes" %1 %2 %3 %4 %5 %6 %7 %8 +call tecmake %1 "USE_GDK=Yes" %2 %3 %4 %5 %6 %7 %8 call tecmake %1 "MF=cd_pdflib" %2 %3 %4 %5 %6 %7 %8 call tecmake %1 "MF=cdpdf" %2 %3 %4 %5 %6 %7 %8 REM call tecmake %1 "MF=cdlua3" %2 %3 %4 %5 %6 %7 %8 diff --git a/src/pdflib/pdcore/pc_file.c b/src/pdflib/pdcore/pc_file.c index 18b9a9d..42a7a02 100644 --- a/src/pdflib/pdcore/pc_file.c +++ b/src/pdflib/pdcore/pc_file.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id: pc_file.c,v 1.2 2009/10/20 18:12:26 scuri Exp $ +/* $Id: pc_file.c,v 1.3 2010/01/27 02:27:21 scuri Exp $ * * Various file routines * @@ -55,6 +55,10 @@ #if defined(WIN32) && !defined(__BORLANDC__) +#ifndef _IOB_ENTRIES +#define _IOB_ENTRIES 20 +#endif + #define PDC_MAXFILEHANDLES 2048 /* set a new maximum for the number of simultaneously open files. diff --git a/src/tecmake_compact.mak b/src/tecmake_compact.mak index e6ce627..e0fe0ee 100644 --- a/src/tecmake_compact.mak +++ b/src/tecmake_compact.mak @@ -193,7 +193,6 @@ RANLIB := $(TEC_TOOLCHAIN)ranlib AR := $(TEC_TOOLCHAIN)ar DEBUGGER := $(TEC_TOOLCHAIN)gdb RCC := $(TEC_TOOLCHAIN)windres -LD := $(TEC_TOOLCHAIN)gcc #---------------------------------# @@ -306,8 +305,10 @@ TARGETDIR := $(TARGETROOT)/$(TEC_UNAME_DIR) ifndef LINKER ifneq "$(findstring .cpp, $(SRC))" "" LINKER := $(CPPC) + LD := $(CPPC) else LINKER := $(CC) + LD := $(CC) endif endif @@ -631,8 +632,13 @@ ifdef USE_LUA LIBS += lualib$(LUASUFX) endif ifndef NO_LUALINK - LIBS += lua$(LUASUFX) - LDIR += $(LUA_LIB) + LIBS += lua$(LUASUFX) + LDIR += $(LUA_LIB) + else + ifneq ($(findstring cygw, $(TEC_UNAME)), ) + LIBS += lua$(LUASUFX) + LDIR += $(LUA_LIB) + endif endif endif @@ -771,7 +777,9 @@ endif ifdef USE_OPENGL override USE_X11 = Yes ifdef USE_MOTIF - LIBS += $(MOTIFGL_LIB) + ifndef USE_IUP3 + LIBS += $(MOTIFGL_LIB) + endif endif LIBS += $(OPENGL_LIBS) LDIR += $(OPENGL_LIB) -- cgit v1.2.3