Fixed redefinition of i

[wxWidgets.git] / contrib / samples / fl / makefile.vc

diff --git a/contrib/samples/fl/makefile.vc b/contrib/samples/fl/makefile.vc
index bca3518e6489a99a4d4731c220b225da38c46ed7..cf3e3bbe5650a7de0849a5a75c7778651843d98a 100644 (file)
--- a/contrib/samples/fl/makefile.vc
+++ b/contrib/samples/fl/makefile.vc
@@ -17,7 +17,7 @@ FL_DEMO1_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 \
        $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(SETUPHDIR) /I. $(__DLLFLAG_p) \
        /D_WINDOWS /I.\..\..\..\samples /I.\..\..\include /DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       $(CXXFLAGS) /GR /GX
 FL_DEMO1_OBJECTS =  \
        $(OBJS)\fl_demo1_fl_demo1.obj \
        $(OBJS)\fl_demo1_fl_demo1.res
@@ -26,7 +26,7 @@ FL_DEMO2_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_13) \
        $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(SETUPHDIR) /I. $(__DLLFLAG_p) \
        /D_WINDOWS /I.\..\..\..\samples /I.\..\..\include /DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       $(CXXFLAGS) /GR /GX
 FL_DEMO2_OBJECTS =  \
        $(OBJS)\fl_demo2_fl_demo2.obj \
        $(OBJS)\fl_demo2_fl_demo2.res
@@ -35,7 +35,7 @@ FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_23) \
        $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(SETUPHDIR) /I. $(__DLLFLAG_p) \
        /D_WINDOWS /I.\..\..\..\samples /I.\..\..\include /DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       $(CXXFLAGS) /GR /GX
 FL_SAMPLE1_OBJECTS =  \
        $(OBJS)\fl_sample1_fl_sample1.obj \
        $(OBJS)\fl_sample1_fl_sample1.res
@@ -44,7 +44,7 @@ FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_33) \
        $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(SETUPHDIR) /I. $(__DLLFLAG_p) \
        /D_WINDOWS /I.\..\..\..\samples /I.\..\..\include /DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       $(CXXFLAGS) /GR /GX
 FL_SAMPLE2_OBJECTS =  \
        $(OBJS)\fl_sample2_fl_sample2.obj \
        $(OBJS)\fl_sample2_fl_sample2.res
@@ -53,7 +53,7 @@ FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_43) \
        $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(SETUPHDIR) /I. $(__DLLFLAG_p) \
        /D_WINDOWS /I.\..\..\..\samples /I.\..\..\include /DBMP_DIR=\"bitmaps/\" \
-       $(CXXFLAGS)
+       $(CXXFLAGS) /GR /GX
 FL_SAMPLE3_OBJECTS =  \
        $(OBJS)\fl_sample3_fl_sample3.obj \
        $(OBJS)\fl_sample3_fl_sample3.res
@@ -359,7 +359,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\fl_demo1.exe $(OBJS)\fl_demo2.exe $(OBJS)\fl_sample1.exe $(OBJS)\fl_sample2.exe $(OBJS)\fl_sample3.exe
+all: $(OBJS)\fl_demo1.exe $(OBJS)\fl_demo2.exe $(OBJS)\fl_sample1.exe $(OBJS)\fl_sample2.exe $(OBJS)\fl_sample3.exe data_files
 
 $(OBJS)\fl_demo1_fl_demo1.obj: .\fl_demo1.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(FL_DEMO1_CXXFLAGS) $**
@@ -400,6 +400,10 @@ clean:
        -if exist $(OBJS)\fl_sample2.exe del $(OBJS)\fl_sample2.exe
        -if exist $(OBJS)\fl_sample3.exe del $(OBJS)\fl_sample3.exe
 
+data_files: 
+       if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps
+       for %f in (bookmarks.bmp class_icon.bmp class_icon1.bmp copy.bmp cut.bmp file_icon.bmp folder_icon.bmp help_icon.bmp new.bmp nextmark.bmp open.bmp paste.bmp prevmark.bmp res_icon.bmp save.bmp saveall.bmp search.bmp start95_dp.bmp start95_pr.bmp tile.bmp) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps
+
 $(OBJS)\fl_demo1.exe: $(FL_DEMO1_OBJECTS) $(OBJS)\fl_demo1_fl_demo1.res
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_7)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
        $(FL_DEMO1_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl.lib $(__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  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib