diff options
| author | Joe Mistachkin <joe@mistachkin.com> | 2008-06-01 02:44:53 (GMT) |
|---|---|---|
| committer | Joe Mistachkin <joe@mistachkin.com> | 2008-06-01 02:44:53 (GMT) |
| commit | 8a1ba857d507f08ae03699c6116c31efd569e5de (patch) | |
| tree | 870c9153f4d89ffe1851612aff23cb74a9e358ed | |
| parent | a2a2c49718f8fdda26f4c14905b28cc2e814044c (diff) | |
| download | tcl-8a1ba857d507f08ae03699c6116c31efd569e5de.zip tcl-8a1ba857d507f08ae03699c6116c31efd569e5de.tar.gz tcl-8a1ba857d507f08ae03699c6116c31efd569e5de.tar.bz2 | |
Add tclOO genstubs to Windows makefiles
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | win/Makefile.in | 7 | ||||
| -rw-r--r-- | win/makefile.vc | 7 |
3 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2008-06-01 Joe Mistachkin <joe@mistachkin.com> + + * win/Makefile.in: Add tclOO genstubs to Windows makefiles and remove + * win/makefile.vc: -DBUILD_tcloo because it is no longer required. + 2008-06-01 Kevin B. Kenny <kennykb@acm.org> * generic/tclOODecls.h: Added the swizzling of DLLEXPORT and @@ -7,7 +12,7 @@ map to silence a compiler warning. Thanks to George Peter Staplin for the report. - + 2008-06-01 Donal K. Fellows <dkf@users.sf.net> * generic/tclOO.decls, unix/Makefile.in (genstubs): Make generation of diff --git a/win/Makefile.in b/win/Makefile.in index 85965de..13d3109 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "./configure", which is a configuration script generated by the "autoconf" # program (constructs like "@foo@" will get replaced in the actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.130 2008/05/31 19:56:07 dkf Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.131 2008/06/01 02:44:54 mistachkin Exp $ VERSION = @TCL_VERSION@ @@ -517,7 +517,7 @@ tclStubLib.${OBJEXT}: tclStubLib.c # Implicit rule for all object files that will end up in the Tcl library .c.${OBJEXT}: - $(CC) -c $(CC_SWITCHES) -DBUILD_tcl -DBUILD_tcloo @DEPARG@ $(CC_OBJNAME) + $(CC) -c $(CC_SWITCHES) -DBUILD_tcl @DEPARG@ $(CC_OBJNAME) .rc.$(RES): $(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(WIN_DIR_NATIVE)" @DEPARG@ @@ -748,6 +748,9 @@ genstubs: "$(GENERIC_DIR_NATIVE)\tcl.decls" \ "$(GENERIC_DIR_NATIVE)\tclInt.decls" \ "$(GENERIC_DIR_NATIVE)\tclTomMath.decls" + $(TCL_EXE) "$(ROOT_DIR_NATIVE)\tools\genStubs.tcl" \ + "$(GENERIC_DIR_NATIVE)" \ + "$(GENERIC_DIR_NATIVE)\tclOO.decls" # # This target creates the HTML folder for Tcl & Tk and places it in diff --git a/win/makefile.vc b/win/makefile.vc index f09356c..b33da87 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.181 2008/05/31 19:56:07 dkf Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.182 2008/06/01 02:44:54 mistachkin Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -90,7 +90,6 @@ the build instructions. # thrdalloc = Use the thread allocator (shared global free pool) # This is the default on threaded builds. # tclalloc = Use the old non-thread allocator -# thrdstorage = Use the generic thread storage support. # symbols = Adds symbols for step debugging. # profile = Adds profiling hooks. Map file is assumed. # loimpact = Adds a flag for how NT treats the heap to keep memory @@ -623,6 +622,8 @@ genstubs: $(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \ $(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls \ $(GENERICDIR:\=/)/tclTomMath.decls + $(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \ + $(GENERICDIR:\=/)/tclOO.decls !endif @@ -876,7 +877,7 @@ $< << {$(GENERICDIR)}.c{$(TMP_DIR)}.obj:: - $(cc32) $(TCL_CFLAGS) -DBUILD_tcl -DBUILD_tcloo -Fo$(TMP_DIR)\ @<< + $(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<< $< << |