Fix unintialized pointer in wxCommandProcessor when

[wxWidgets.git] / samples / minimal / makefile.vc

diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc
index 6e1b1a7f69bc46a0b6e11ca4bb83a6bd84f7e881..d309162a1aa8bd1d30655d594afbd7e61943e8d8 100644 (file)
--- a/samples/minimal/makefile.vc
+++ b/samples/minimal/makefile.vc
@@ -43,7 +43,7 @@ WXUNIV = 0
 ### Variables: ###
 
 OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-MINIMAL_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib  /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS)
+MINIMAL_CXXFLAGS = $(CPPFLAGS) /MD$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\minimal.pdb $(__OPTIMIZEFLAG_3)  /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\include /I.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\src\tiff /I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib  /I.\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS)
 
 ### Conditionally set variables: ###
 
@@ -66,6 +66,24 @@ WXUNICODEFLAG = u
 WXUNIVNAME = univ
 !endif
 !if "$(BUILD)" == "debug"
+__DEBUGFLAG_0 = /Zi
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_0 = 
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUGFLAG_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_1 = 
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUGFLAG_2 = d
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_2 = 
+!endif
+!if "$(BUILD)" == "debug"
 __DEBUG_DEFINE_p = /D__WXDEBUG__
 !endif
 !if "$(BUILD)" == "debug"
@@ -77,6 +95,12 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /dWXUSINGDLL
 !endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_3 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_3 = /O2
+!endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
@@ -112,7 +136,7 @@ $(OBJS)\minimal_minimal.obj: .\minimal.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MINIMAL_CXXFLAGS) $**
 
 $(OBJS)\minimal_minimal.res: .\minimal.rc
-       rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i./../../include /i./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i./../../src/tiff /i./../../src/jpeg /i./../../src/png /i./../../src/zlib  /i./../../src/regex /i. $(__DLLFLAG_p_1) $**
+       rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\include /i.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\src\tiff /i.\..\..\src\jpeg /i.\..\..\src\png /i.\..\..\src\zlib  /i.\..\..\src\regex /i. $(__DLLFLAG_p_1) $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -122,7 +146,7 @@ clean:
 install: all
 
 $(OBJS)\minimal.exe: $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
        $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  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
 <<