X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c33fae85b045360d02f61b5940f775d2ce096b65..0148745bb7a9b1e1046229577fbd802eb9f03e8f:/samples/console/makefile.wat diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat index da3a61f8cd..49a018b842 100644 --- a/samples/console/makefile.wat +++ b/samples/console/makefile.wat @@ -155,15 +155,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 @@ -210,7 +210,7 @@ $(OBJS)\console.exe : $(CONSOLE_OBJECTS) @%append $(OBJS)\console.lbc option caseexact @%append $(OBJS)\console.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' @for %i in ($(CONSOLE_OBJECTS)) do @%append $(OBJS)\console.lbc file %i - @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_ODBC_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)\console.lbc library %i + @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_ODBC_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)\console.lbc library %i @%append $(OBJS)\console.lbc wlink @$(OBJS)\console.lbc