diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-13 10:37:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-06-13 10:37:24 (GMT) |
| commit | a9417a5cc8802ec3945cbc12e39ed01724be0067 (patch) | |
| tree | 83a004e66e134b8ec0416e8d69277ae94c969bb8 /unix/Makefile.in | |
| parent | 347946d329fcc454775484c08e7764054811c92a (diff) | |
| parent | ccfa40c8ce8aca2cfd03317fab6b31cdc3910895 (diff) | |
| download | tk-a9417a5cc8802ec3945cbc12e39ed01724be0067.zip tk-a9417a5cc8802ec3945cbc12e39ed01724be0067.tar.gz tk-a9417a5cc8802ec3945cbc12e39ed01724be0067.tar.bz2 | |
Some more fixes for Cygwin32/64 in win32 GUI mode.
Now that this is fully working, eliminate all usage of WISH_BUILD_LIB_SPEC: TK_BUILD_LIB_SPEC can be used everywhere in stead.
Remove some old carbon-leftovers from configure/make (see [3607215]).
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 2179ab9..7079cbd 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -616,8 +616,8 @@ ${WISH_EXE}: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@ -f "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ cp "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" .; \ fi - ${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @WISH_BUILD_LIB_SPEC@ \ - $(CC_SEARCH_FLAGS) -o ${WISH_EXE} + ${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \ + $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o ${WISH_EXE} # Resetting the LIB_RUNTIME_DIR below is required so that # the generated tktest executable gets the build directory |