diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-15 19:44:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-15 19:44:16 (GMT) |
| commit | 56928342c391b450d4b3a60c8ced58663226cbd5 (patch) | |
| tree | 20090cc6f8b3403bda3a4325862915621e0e4347 /win | |
| parent | 235ea4722ad245718e50209913a266bfd5562459 (diff) | |
| parent | ca78e51fd3dbc37eba7c18764fac1a91dbafcc44 (diff) | |
| download | tk-56928342c391b450d4b3a60c8ced58663226cbd5.zip tk-56928342c391b450d4b3a60c8ced58663226cbd5.tar.gz tk-56928342c391b450d4b3a60c8ced58663226cbd5.tar.bz2 | |
Merge trunk
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 3c1c9e3..f0352196 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -216,6 +216,7 @@ NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED # required just to do a normal build although it can be required to run # make dist. TCL_EXE = @TCLSH_PROG@ +WINE = @WINE@ CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ -I"${GENERIC_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ @@ -440,23 +441,23 @@ $(MAN2TCL): $(TCL_SRC_DIR)/tools/man2tcl.c test: test-classic test-ttk test-classic: binaries $(TKTEST) $(TEST_DLL_FILE) $(CAT32) - $(SHELL_ENV) ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" \ - $(TESTFLAGS) | ./$(CAT32) + $(SHELL_ENV) $(WINE) ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" \ + $(TESTFLAGS) | $(WINE) ./$(CAT32) test-ttk: binaries $(TKTEST) $(TEST_DLL_FILE) $(CAT32) - $(SHELL_ENV) ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/ttk/all.tcl" \ - $(TESTFLAGS) | ./$(CAT32) + $(SHELL_ENV) $(WINE) ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/ttk/all.tcl" \ + $(TESTFLAGS) | $(WINE) ./$(CAT32) runtest: binaries $(TKTEST) $(TEST_DLL_FILE) - $(SHELL_ENV) ./$(TKTEST) $(TESTFLAGS) $(SCRIPT) + $(SHELL_ENV) $(WINE) ./$(TKTEST) $(TESTFLAGS) $(SCRIPT) # This target can be used to run wish from the build directory # via `make shell` or `make shell SCRIPT=foo.tcl` shell: binaries - $(SHELL_ENV) ./$(WISH) $(SCRIPT) + $(SHELL_ENV) $(WINE) ./$(WISH) $(SCRIPT) demo: $(WISH) - $(SHELL_ENV) ./$(WISH) $(ROOT_DIR)/library/demos/widget + $(SHELL_ENV) $(WINE) ./$(WISH) $(ROOT_DIR)/library/demos/widget # This target can be used to run wish inside either gdb or insight gdb: binaries |