X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c33fae85b045360d02f61b5940f775d2ce096b65..e07a2142811be9d4a4f5eaa730eeebcbe88b24c9:/samples/typetest/makefile.wat diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat index e96fe45861..1e62809366 100644 --- a/samples/typetest/makefile.wat +++ b/samples/typetest/makefile.wat @@ -127,15 +127,15 @@ __WXLIB_MONO_p = & !endif __LIB_TIFF_p = !ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib !endif __LIB_JPEG_p = !ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib !endif __LIB_PNG_p = !ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !endif LIBDIRNAME = !ifeq SHARED 0 @@ -203,7 +203,7 @@ $(OBJS)\typetest.exe : $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res @%append $(OBJS)\typetest.lbc option caseexact @%append $(OBJS)\typetest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\typetest.lbc library %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\typetest.lbc library %i @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_typetest.res wlink @$(OBJS)\typetest.lbc