diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-09-26 13:04:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-09-26 13:04:14 (GMT) |
| commit | 8e313cd75cb1ca83ccddbbd7936243eb69b0bb27 (patch) | |
| tree | 7e499942d70547287b75318ad5f465246920f97a | |
| parent | 7eb8135cd12ab7a65dc98b73ff16cf3bf5b8549f (diff) | |
| download | tk-8e313cd75cb1ca83ccddbbd7936243eb69b0bb27.zip tk-8e313cd75cb1ca83ccddbbd7936243eb69b0bb27.tar.gz tk-8e313cd75cb1ca83ccddbbd7936243eb69b0bb27.tar.bz2 | |
Compile win32 binaries with -DTCL_NO_DEPRECATED
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | win/Makefile.in | 24 |
2 files changed, 19 insertions, 9 deletions
@@ -1,3 +1,7 @@ +2012-09-26 Jan Nijtmans <nijtmans@users.sf.net> + + * win/Makefile.in: Compile win32 binaries with -DTCL_NO_DEPRECATED + 2012-08-28 Jan Nijtmans <nijtmans@users.sf.net> * generic/tkMenuDraw.c: [Bug 3562426]: Context menu goes out of edge of diff --git a/win/Makefile.in b/win/Makefile.in index 19670c7..b4a06a0 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -160,12 +160,18 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@ +# Tk does not used deprecated Tcl constructs so it should +# compile fine with -DTCL_NO_DEPRECATED. To remove its own +# set of deprecated code uncomment the second line. +NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED +#NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED -DTK_NO_DEPRECATED + # To change the compiler switches, for example to change from optimization to # debugging symbols, change the following line: #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ +CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ $(NO_DEPRECATED_FLAGS) # Special compiler flags to use when building man2tcl on Windows. MAN2TCLFLAGS = @MAN2TCLFLAGS@ @@ -185,12 +191,12 @@ EXEEXT = @EXEEXT@ OBJEXT = @OBJEXT@ STLIB_LD = @STLIB_LD@ SHLIB_LD = @SHLIB_LD@ -SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ $(TCL_STUB_LIB_FILE) $(LIBS) +SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_SUFFIX = @SHLIB_SUFFIX@ VER = @TK_MAJOR_VERSION@@TK_MINOR_VERSION@ DOTVER = @TK_MAJOR_VERSION@.@TK_MINOR_VERSION@ -LIBS = @LIBS@ @LIBS_GUI@ +LIBS = $(TCL_STUB_LIB_FILE) @LIBS@ @LIBS_GUI@ RMDIR = rm -rf MKDIR = mkdir -p SHELL = @SHELL@ @@ -389,7 +395,7 @@ $(MAN2TCL): $(TCL_SRC_DIR)/tools/man2tcl.c test: test-classic -test-classic: binaries $(TKTEST) +test-classic: binaries $(TKTEST) $(CAT32) $(SHELL_ENV) ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" \ $(TESTFLAGS) | ./$(CAT32) @@ -474,8 +480,8 @@ install-libraries: libraries $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \ done; @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; - @for i in $(ROOT_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ - $(ROOT_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ + @for i in $(ROOT_DIR)/library/*.tcl $(ROOT_DIR)/library/tclIndex \ + $(GENERIC_DIR)/prolog.ps $(UNIX_DIR)/tkAppInit.c; \ do \ $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \ done; @@ -551,14 +557,14 @@ install-private-headers: libraries $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \ done; -$(WISH): $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(WISH_OBJS) wish.$(RES) +$(WISH): $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) wish.$(RES) $(CC) $(CFLAGS) $(WISH_OBJS) $(TCL_LIB_FILE) $(TK_LIB_FILE) $(LIBS) \ wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW) @VC_MANIFEST_EMBED_EXE@ -tktest : $(TKTEST) +tktest: $(TKTEST) -$(TKTEST): $(TK_LIB_FILE) $(TKTEST_OBJS) wish.$(RES) $(CAT32) +$(TKTEST): $(TKTEST_OBJS) $(TK_LIB_FILE) wish.$(RES) $(CC) $(CFLAGS) $(TKTEST_OBJS) $(TCL_LIB_FILE) \ $(TK_LIB_FILE) $(LIBS) \ wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW) |