compilation fix for gcc (closes bug 996701)

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

diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat
index ca0680bec235aad42605917c55ebf89b6e8a240a..152eceb55fbf5ec72d7bc6d5b8373244ff733234 100644 (file)
--- a/samples/dialogs/makefile.wat
+++ b/samples/dialogs/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)

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


@@ -110,6 +110,14 @@ __EXCEPTIONSFLAG_7 =
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG_7 = -xs
 !endif
 !ifeq USE_EXCEPTIONS 1
 __EXCEPTIONSFLAG_7 = -xs
 !endif

+____GENERIC_FILES_FILENAMES_OBJECTS =
+!ifeq WXUNIV 0
+____GENERIC_FILES_FILENAMES_OBJECTS =  &
+       $(OBJS)\dialogs_colrdlgg.obj &
+       $(OBJS)\dialogs_dirdlgg.obj &
+       $(OBJS)\dialogs_filedlgg.obj &
+       $(OBJS)\dialogs_fontdlgg.obj
+!endif

 __WXLIB_ADV_p =
 !ifeq MONOLITHIC 0
 __WXLIB_ADV_p = &
 __WXLIB_ADV_p =
 !ifeq MONOLITHIC 0
 __WXLIB_ADV_p = &


@@ -181,7 +189,8 @@ DIALOGS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5)
        -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples &
        $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  &
        -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples &
        $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  &

-       $(OBJS)\dialogs_dialogs.obj
+       $(OBJS)\dialogs_dialogs.obj &
+       $(____GENERIC_FILES_FILENAMES_OBJECTS)

 
 
 all : $(OBJS)
 
 
 all : $(OBJS)


@@ -206,7 +215,7 @@ $(OBJS)\dialogs.exe :  $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
        @%append $(OBJS)\dialogs.lbc option caseexact
        @%append $(OBJS)\dialogs.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i
        @%append $(OBJS)\dialogs.lbc option caseexact
        @%append $(OBJS)\dialogs.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
        @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i

-       @for %i in ( $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(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)\dialogs.lbc library %i
+       @for %i in ( $(__WXLIB_ADV_p)  $(__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)\dialogs.lbc library %i

        @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res
        wlink @$(OBJS)\dialogs.lbc
 
        @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res
        wlink @$(OBJS)\dialogs.lbc
 


@@ -217,5 +226,17 @@ data : .SYMBOLIC
 $(OBJS)\dialogs_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
        $(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
 
 $(OBJS)\dialogs_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
        $(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
 

+$(OBJS)\dialogs_colrdlgg.obj :  .AUTODEPEND .\..\..\src\generic\colrdlgg.cpp
+       $(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_dirdlgg.obj :  .AUTODEPEND .\..\..\src\generic\dirdlgg.cpp
+       $(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_filedlgg.obj :  .AUTODEPEND .\..\..\src\generic\filedlgg.cpp
+       $(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+
+$(OBJS)\dialogs_fontdlgg.obj :  .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp
+       $(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
+

 $(OBJS)\dialogs_dialogs.res :  .AUTODEPEND .\dialogs.rc
        wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
 $(OBJS)\dialogs_dialogs.res :  .AUTODEPEND .\dialogs.rc
        wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<