Changeset 1000 for trunk/gsdl/lib

Timestamp:

2000-03-02T11:23:47+13:00 (24 years ago)

Author:

sjboddie

Message:

tidied up windows installation

Location:

trunk/gsdl/lib

Files:

• gsdltools.h (modified) (1 diff)
• win32.mak (modified) (2 diffs)

trunk/gsdl/lib/gsdltools.h

@@ -30 +30 @@
 #define GSDLTOOLS_H
 
+// don't actually use this but some windows
+// versions of STL complain about use of 
+// bool keyword without it
+#include "text_t.h"
+
 // returns true if machine is little endian
 bool littleEndian();

trunk/gsdl/lib/win32.mak

@@ -25 +25 @@
 ###########################################################################
 
+GSDLHOME = d:\home\dl\gsdl
+STLPATH = d:\home\dl\stl\stlport
+
 AR = lib
 CC = cl
 CPPFLAGS =
-DEFS = -DQUIET -D__WIN32__ -D_LITTLE_ENDIAN -DGSDL_NAMESPACE_BROKEN \
+DEFS = -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \
     -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS
-INCLUDES = -I../packages/mg/lib -I f:\STLport-3.2\stlport
+INCLUDES = -I$(GSDLHOME)\packages\mg\lib -I$(STLPATH)
 
 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
@@ -43 +46 @@
     $(COMPILE) $< 
 
-
 HEADERS = \
   cfgread.h      fileutil.h     gsdlunicode.h  text_t.h \
-  display.h      gsdlconf.h     gsdltimes.h
+  display.h      gsdlconf.h     gsdltimes.h    gsdltools.h
 
 SOURCES = \
   cfgread.cpp      fileutil.cpp     text_t.cpp \
-  display.cpp      gsdlunicode.cpp  gsdltimes.cpp
+  display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp
 
 OBJECTS = \
   cfgread.obj        fileutil.obj       text_t.obj   \
-  display.obj        gsdlunicode.obj    gsdltimes.obj
+  display.obj        gsdlunicode.obj    gsdltimes.obj  gsdltools.obj
 
 all: gsdllib.lib
 
-GSDLLIBOBJECTS = $(OBJECTS)
-
-gsdllib.lib : $(GSDLLIBOBJECTS)
+gsdllib.lib : $(OBJECTS)
     del gsdllib.lib
-    $(AR) /out:gsdllib.lib $(GSDLLIBOBJECTS)
+    $(AR) /out:gsdllib.lib $(OBJECTS)
 
 clean: