summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscuri <scuri>2010-07-14 18:45:51 +0000
committerscuri <scuri>2010-07-14 18:45:51 +0000
commit9d336f5f284149f4e03db7db117bde276890a37f (patch)
tree3884337e9d0761170e3ac6b465dd8329d99b63b5
parentb2e7b2d36fa083b5702d1e2a8db62b32aa1b5699 (diff)
*** empty log message ***
-rw-r--r--html/en/history.html6
-rw-r--r--src/cdgl.mak11
-rw-r--r--test/simple/config.mak4
-rw-r--r--test/simple/simple.bat2
4 files changed, 16 insertions, 7 deletions
diff --git a/html/en/history.html b/html/en/history.html
index b24d1c3..698c416 100644
--- a/html/en/history.html
+++ b/html/en/history.html
@@ -27,6 +27,12 @@
<body>
<h2>History of Changes</h2>
+<h3>CVS (14/July/2010)</h3>
+<ul>
+ <li>
+ <span class="hist_fixed">Fixed:</span> CD_GL static library for Visual
+ C++ compilers were incorrectly using FTGL as dynamic library.</li>
+</ul>
<h3><a href="http://sourceforge.net/projects/canvasdraw/files/5.4/">Version 5.4</a> (24/June/2010)</h3>
<ul>
<li><span class="hist_new">New:</span> context plus driver
diff --git a/src/cdgl.mak b/src/cdgl.mak
index 800955e..6f63fa7 100644
--- a/src/cdgl.mak
+++ b/src/cdgl.mak
@@ -7,14 +7,19 @@ SRC = drv/cdgl.c
INCLUDES = . sim ftgl freetype2
LIBS = ftgl
-ifeq ($(findstring Win, $(TEC_SYSNAME)), )
-# LIBS += iconv
-endif
USE_OPENGL = YES
USE_CD = YES
CD = ..
+ifneq ($(findstring Win, $(TEC_SYSNAME)), )
+ ifeq ($(findstring dll, $(TEC_UNAME)), )
+ DEFINES += FTGL_LIBRARY_STATIC
+ endif
+else
+# LIBS += iconv
+endif
+
ifneq ($(findstring AIX, $(TEC_UNAME)), )
DEFINES += NO_FONTCONFIG
endif
diff --git a/test/simple/config.mak b/test/simple/config.mak
index 6baa00a..590ec0e 100644
--- a/test/simple/config.mak
+++ b/test/simple/config.mak
@@ -37,8 +37,6 @@ USE_STATIC = Yes
#IUP = ../../../iup
#CD = ../..
-#USE_IM = Yes
-
USE_OPENGL = Yes
ifdef USE_OPENGL
DEFINES += USE_OPENGL
@@ -50,7 +48,7 @@ ifneq ($(findstring Win, $(TEC_SYSNAME)), )
LIBS += cdcontextplus gdiplus
endif
ifdef USE_OPENGL
- LIBS += cdgl ftgl
+ LIBS += ftgl cdgl
endif
else
ifdef DBG_DIR
diff --git a/test/simple/simple.bat b/test/simple/simple.bat
index fa8f118..63cc13f 100644
--- a/test/simple/simple.bat
+++ b/test/simple/simple.bat
@@ -1,3 +1,3 @@
@echo off
-REM Script generated automatically by tecmake v3.13
+REM Script generated automatically by tecmake v4.1
..\bin\Win32\simple.exe %*