Changeset 11256 for trunk/gsdl/src/db2txt

Timestamp:

2006-02-15T14:36:10+13:00 (18 years ago)

Author:

mdewsnip

Message:

Added a "GSDL_VC4" option that has to be specified with the nmake command when using Visual C++ 4. This is used to determine whether "-GX" (Visual C++ 4) or "-EHsc" (Visual C++ 6/Visual Studio 2005) is specified as a command-line option to the compiler.

File:

• trunk/gsdl/src/db2txt/win32.mak (modified) (3 diffs)

trunk/gsdl/src/db2txt/win32.mak

@@ -26 +26 @@
 
 GSDLHOME = ..\..
+GSDL_VC4 = 0
 USE_STLPORT = 0
 STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
@@ -31 +32 @@
 AR = lib
 CC = cl
-CPPFLAGS = 
+
+!IF $(GSDL_VC4)
+CPPFLAGS = -GX
+!ELSE
+CPPFLAGS = -EHsc
+!ENDIF
+
 LDFLAGS =
 
@@ -45 +52 @@
        "$(GSDLHOME)\packages\windows\gdbm\gdbm\gdbm.lib"
 
-COMPILE = $(CC) -nologo -c -GX $(DEFS) $(INCLUDES)
+COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
 LINK = $(CC) -nologo $(LDFLAGS)