Changeset 2338 for trunk/gsdl/lib

Timestamp:

2001-04-25T22:29:11+12:00 (23 years ago)

Author:

sjboddie

Message:

Tidied up windows makefiles to make compiling under windows a little
easier.

File:

• trunk/gsdl/lib/win32.mak (modified) (4 diffs)

trunk/gsdl/lib/win32.mak

@@ -26 +26 @@
 
 GSDLHOME = ..
-STLPATH = f:\stlport
+USE_STLPORT = 0
+LOCAL_LIBRARY = 0
+STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
 
 AR = lib
 CC = cl
 CPPFLAGS =
-# note that if compiling with a newer version of VC++ than 4.2 we'll
-# use the built in STL and so the following definitions should not 
-# be defined - this setup is for use with VC++ 4.2 and STLPort
-# GSDL_NAMESPACE_BROKEN
-# GSDL_USE_IOS_H
-# __STL_NO_NEW_IOSTREAMS
-DEFS = -DQUIET -D__WIN32__ -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H \
-    -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H -D__STL_NO_NEW_IOSTREAMS
-INCLUDES = -I$(GSDLHOME)\packages\mg\lib -I$(STLPATH)
+
+DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN \
+       -DSHORT_SUFFIX
+INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\packages\mg\lib"
+!IF $(USE_STLPORT)
+DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
+INCLUDES = $(INCLUDES) -I$(STLPATH)
+!ENDIF
+!IF $(LOCAL_LIBRARY)
+DEFS = $(DEFS) -DGSDL_LOCAL_LIBRARY
+!ENDIF
 
 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
@@ -52 +56 @@
     $(COMPILE) $< 
 
-HEADERS = \
-  cfgread.h      fileutil.h     gsdlunicode.h  text_t.h \
-  display.h      gsdlconf.h     gsdltimes.h    gsdltools.h
+HEADERS = cfgread.h fileutil.h gsdlunicode.h text_t.h display.h gsdlconf.h \
+      gsdltimes.h gsdltools.h cnfgable.h cnfgator.h
 
-SOURCES = \
-  cfgread.cpp      fileutil.cpp     text_t.cpp \
-  display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp
+SOURCES = cfgread.cpp fileutil.cpp gsdlunicode.cpp text_t.cpp display.cpp \
+      gsdltimes.cpp gsdltools.cpp cnfgable.cpp cnfgator.cpp
 
-OBJECTS = \
-  cfgread.obj        fileutil.obj       text_t.obj   \
-  display.obj        gsdlunicode.obj    gsdltimes.obj  gsdltools.obj
+OBJECTS = cfgread.obj fileutil.obj gsdlunicode.obj text_t.obj display.obj \
+      gsdltimes.obj gsdltools.obj cnfgable.obj cnfgator.obj
 
 all: gsdllib.lib
@@ -70 +71 @@
     $(AR) /out:gsdllib.lib $(OBJECTS)
 
+# we want gsdltools to always be compiled in case the status of
+# GSDL_LOCAL_LIBRARY has changed
+gsdltools.obj: FORCE
+
 clean:
     del *.obj 
@@ -75 +80 @@
 
 install:
+
+FORCE: