X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03c6117e8f6c958c1bc2602132ded643fc703cbf..cf7f7d5d96c178d35ceb96fe74ea3eb13dd009de:/utils/wxrc/makefile.wat?ds=sidebyside diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat index b913943389..e4888daff9 100644 --- a/utils/wxrc/makefile.wat +++ b/utils/wxrc/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.4 (http://www.bakefile.org) +# Bakefile 0.2.6 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -18,7 +18,11 @@ ! loaddll wpp wppdi86 ! loaddll wppaxp wppdaxp ! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else ! loaddll wlink wlink +! endif ! loaddll wlib wlibd !endif @@ -245,7 +249,7 @@ $(OBJS)\wxrc.exe : $(WXRC_OBJECTS) @%append $(OBJS)\wxrc.lbc option caseexact @%append $(OBJS)\wxrc.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i - @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\wxrc.lbc library %i + @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) 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 wininet.lib) do @%append $(OBJS)\wxrc.lbc library %i @%append $(OBJS)\wxrc.lbc @for %i in () do @%append $(OBJS)\wxrc.lbc option stack=%i wlink @$(OBJS)\wxrc.lbc