compilation fix for wxOSX_USE_EXPERIMENTAL_FONTDIALOG==0 (closes #10834)

[wxWidgets.git] / samples / listctrl / makefile.wat

diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat
index dfdfd55cdd7ae461f7d6d9b5e5eb75eb15d987f6..f86555789ef7e37f8f8b292567a18f22d659acfc 100644 (file)
--- a/samples/listctrl/makefile.wat
+++ b/samples/listctrl/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -18,7 +18,11 @@
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386

+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else

 !  loaddll wlink    wlink
 !  loaddll wlink    wlink

+! endif

 !  loaddll wlib     wlibd
 !endif
 
 !  loaddll wlib     wlibd
 !endif
 


@@ -253,7 +257,7 @@ $(OBJS)\listctrl.exe :  $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res
        @%append $(OBJS)\listctrl.lbc option caseexact
        @%append $(OBJS)\listctrl.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
        @for %i in ($(LISTCTRL_OBJECTS)) do @%append $(OBJS)\listctrl.lbc file %i
        @%append $(OBJS)\listctrl.lbc option caseexact
        @%append $(OBJS)\listctrl.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
        @for %i in ($(LISTCTRL_OBJECTS)) do @%append $(OBJS)\listctrl.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).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)\listctrl.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 $(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)\listctrl.lbc library %i

        @%append $(OBJS)\listctrl.lbc option resource=$(OBJS)\listctrl_listtest.res
        @for %i in () do @%append $(OBJS)\listctrl.lbc option stack=%i
        wlink @$(OBJS)\listctrl.lbc
        @%append $(OBJS)\listctrl.lbc option resource=$(OBJS)\listctrl_listtest.res
        @for %i in () do @%append $(OBJS)\listctrl.lbc option stack=%i
        wlink @$(OBJS)\listctrl.lbc