Use wxScopedCharBuffer in To8BitData() in ANSI build too.

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

diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc
index c956100ff7e45ff25cd0afd66c19f18e71f927be..d05b0358615ebd0ea0124976cda43ef4dd010794 100644 (file)
--- a/samples/dialogs/makefile.vc
+++ b/samples/dialogs/makefile.vc
@@ -23,9 +23,9 @@ SETUPHDIR = \
 DIALOGS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \\r
        $(__DEBUGINFO_0) /Fd$(OBJS)\dialogs.pdb $(____DEBUGRUNTIME_3_p) \\r
        $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \\r
+       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
+       $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \\r
        $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \\r
        /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \\r
        $(CPPFLAGS) $(CXXFLAGS)\r
@@ -33,7 +33,7 @@ DIALOGS_OBJECTS =  \
        $(OBJS)\dialogs_dialogs.obj \\r
        $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)\r
 DIALOGS_RESOURCES =  \\r
-       $(OBJS)\dialogs_dialogs.res\r
+       $(OBJS)\dialogs_sample.res
 \r
 ### Conditionally set variables: ###\r
 \r
@@ -232,6 +232,18 @@ __DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
 !if "$(DEBUG_FLAG)" == "0"\r
 __DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0\r
 !endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p = /DNDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p = /DNDEBUG\r
+!endif\r
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"\r
+__NDEBUG_DEFINE_p_1 = /d NDEBUG\r
+!endif\r
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"\r
+__NDEBUG_DEFINE_p_1 = /d NDEBUG\r
+!endif\r
 !if "$(USE_EXCEPTIONS)" == "0"\r
 __EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS\r
 !endif\r
@@ -268,12 +280,6 @@ __MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
 !if "$(MSLU)" == "1"\r
 __MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1\r
 !endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
 !if "$(USE_CAIRO)" == "1"\r
 ____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo\r
 !endif\r
@@ -321,9 +327,6 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !if "$(MSLU)" == "1"\r
 __UNICOWS_LIB_p = unicows.lib\r
 !endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
 !if "$(USE_CAIRO)" == "1"\r
 __CAIRO_LIB_p = cairo.lib\r
 !endif\r
@@ -348,15 +351,18 @@ clean:
        -if exist $(OBJS)\dialogs.ilk del $(OBJS)\dialogs.ilk\r
        -if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb\r
 \r
-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res\r
+$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample.res
        link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<\r
-       $(DIALOGS_OBJECTS) $(DIALOGS_RESOURCES)  $(__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 $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) $(__CAIRO_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\r
+       $(DIALOGS_OBJECTS) $(DIALOGS_RESOURCES)  $(__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 $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_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\r
 <<\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
+$(OBJS)\dialogs_sample.res: .\..\..\samples\sample.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
 $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp\r
 \r
@@ -372,6 +378,3 @@ $(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
 $(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp\r
 \r
-$(OBJS)\dialogs_dialogs.res: .\dialogs.rc\r
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dialogs.rc\r
-\r