X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53ec4e97715cc01aee7cf3b991449a4aafba3909..9c2d002b3e7099cd142a15593391774effdcbf2c:/samples/notebook/makefile.wat diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat index 83c4a4ca1c..7d693f6253 100644 --- a/samples/notebook/makefile.wat +++ b/samples/notebook/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)\notebook.exe : $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_notebook.res @%append $(OBJS)\notebook.lbc option caseexact @%append $(OBJS)\notebook.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' @for %i in ($(NOTEBOOK_OBJECTS)) do @%append $(OBJS)\notebook.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)\notebook.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)\notebook.lbc library %i @%append $(OBJS)\notebook.lbc option resource=$(OBJS)\notebook_notebook.res wlink @$(OBJS)\notebook.lbc