summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavygrvy <davygrvy@pobox.com>2008-06-14 02:07:44 (GMT)
committerdavygrvy <davygrvy@pobox.com>2008-06-14 02:07:44 (GMT)
commit1a59e0bb027af6869bd742b0e8f56a958f885ca9 (patch)
treeffda953644973f4f1a924dc67503982f7f8a87ab
parent916ab1d6c6fc833e424a316adb46716bc8ffaff2 (diff)
downloadtcl-1a59e0bb027af6869bd742b0e8f56a958f885ca9.zip
tcl-1a59e0bb027af6869bd742b0e8f56a958f885ca9.tar.gz
tcl-1a59e0bb027af6869bd742b0e8f56a958f885ca9.tar.bz2
The Stubs source files (tclStubLib.c and tclOOStubLib.c) should not be
compiled with the -GL flag.
-rw-r--r--win/makefile.vc8
1 files changed, 6 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 2ed2e8b..f35a8bc 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,7 +13,7 @@
# Copyright (c) 2003-2008 Pat Thoyts.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.184 2008/06/13 05:45:15 mistachkin Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.185 2008/06/14 02:07:44 davygrvy Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -460,7 +460,8 @@ TCL_DEFINES = -DTCL_PIPE_DLL=\"$(TCLPIPEDLLNAME)\" -DTCL_TOMMATH -DMP_PREC=4 -Di
BASE_CFLAGS = $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) $(TCL_DEFINES)
CON_CFLAGS = $(cflags) $(cdebug) $(crt) -DCONSOLE
TCL_CFLAGS = $(BASE_CFLAGS) $(OPTDEFINES)
-STUB_CFLAGS = $(cflags) $(cdebug) $(OPTDEFINES)
+### Stubs files should not be compiled with -GL
+STUB_CFLAGS = $(cflags) $(cdebug:-GL=) $(OPTDEFINES)
#---------------------------------------------------------------------
@@ -904,6 +905,9 @@ $(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
$(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c
$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?
+
+$(TMP_DIR)\tclOOStubLib.obj: $(GENERICDIR)\tclOOStubLib.c
+ $(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -Fo$@ $?
#---------------------------------------------------------------------
# Generate the source dependencies. Having dependency rules will