diff options
| author | davygrvy <davygrvy> | 2004-01-13 02:01:39 (GMT) |
|---|---|---|
| committer | davygrvy <davygrvy> | 2004-01-13 02:01:39 (GMT) |
| commit | 0e8d429d76ce7be9a8bf9f7351c002cd4c31314b (patch) | |
| tree | c768098950270689b01851184681d62cfa742b00 /win/makefile.vc | |
| parent | a70f322b94fb45e096f11ac6ded83285f7981d6a (diff) | |
| download | tk-0e8d429d76ce7be9a8bf9f7351c002cd4c31314b.zip tk-0e8d429d76ce7be9a8bf9f7351c002cd4c31314b.tar.gz tk-0e8d429d76ce7be9a8bf9f7351c002cd4c31314b.tar.bz2 | |
* win/rc/tk.rc:
* win/rc/tk_base.rc:
* win/rc/wish.rc:
* win/makefile.vc: Refreshed how the resource files are built.
Should be a bit easier for people linking with a static Tk library.
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 23252ad..8f5b502 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2003 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.77 2003/12/23 02:59:12 davygrvy Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.78 2004/01/13 02:01:39 davygrvy Exp $ #------------------------------------------------------------------------------ !if "$(MSVCDIR)" == "" @@ -433,8 +433,8 @@ dlllflags = $(lflags) -dll conlflags = $(lflags) -subsystem:console guilflags = $(lflags) -subsystem:windows -baselibs = kernel32.lib advapi32.lib user32.lib ole32.lib oleaut32.lib uuid.lib -guilibs = $(baselibs) shell32.lib gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib +baselibs = kernel32.lib user32.lib ole32.lib oleaut32.lib +guilibs = $(baselibs) gdi32.lib #--------------------------------------------------------------------- @@ -612,7 +612,7 @@ $(MAN2HELP) $(MAN2HELP2) $(INDEX): $(TCLTOOLSDIR)\$$(@F) $(CPY) $(TCLTOOLSDIR)\$(@F) $(@D) $(BMP): - $(CPY) $(WINDIR)\$(@F) $(@D) + $(CPY) $(WINDIR)\rc\$(@F) $(@D) $(HELPFILE): $(HELPRTF) $(BMP) cd $(DOCTMP_DIR) @@ -790,15 +790,8 @@ $< {$(RCDIR)}.rc{$(TMP_DIR)}.res: $(rc32) -fo $@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) \ -!if $(DEBUG) - -d DEBUG \ -!endif -!if $(TCL_THREADS) - -d TCL_THREADS \ -!endif -!if $(STATIC_BUILD) - -d STATIC_BUILD \ -!endif + -d DEBUG=$(DEBUG) -d TCL_THREADS=$(TCL_THREADS) \ + -d STATIC_BUILD=$(STATIC_BUILD) \ $< #--------------------------------------------------------------------- |