Use template class instead of template function in wxVectorSort().

[wxWidgets.git] / samples / validate / makefile.bcc

diff --git a/samples/validate/makefile.bcc b/samples/validate/makefile.bcc
index 54aeafe2b24d0a7d359d446a1e0d4882c4c3f145..64feca6ab1a8fc8fc920ad1196739b211828e784 100644 (file)
--- a/samples/validate/makefile.bcc
+++ b/samples/validate/makefile.bcc
@@ -30,9 +30,9 @@ SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 VALIDATE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
        $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 VALIDATE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
        $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -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) -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
        -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
 VALIDATE_OBJECTS =  \\r
        $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
        -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
 VALIDATE_OBJECTS =  \\r


@@ -112,6 +112,12 @@ __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
 !if "$(DEBUG_FLAG)" == "0"\r
 __DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
 !endif\r
 !if "$(DEBUG_FLAG)" == "0"\r
 __DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0\r
 !endif\r

+!if "$(BUILD)" == "release"\r
+__NDEBUG_DEFINE_p = -DNDEBUG\r
+!endif\r
+!if "$(BUILD)" == "release"\r
+__NDEBUG_DEFINE_p_1 = -dNDEBUG\r
+!endif\r

 !if "$(USE_EXCEPTIONS)" == "0"\r
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
 !endif\r
 !if "$(USE_EXCEPTIONS)" == "0"\r
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
 !endif\r


@@ -148,12 +154,6 @@ __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
 !if "$(MSLU)" == "1"\r
 __MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1\r
 !endif\r
 !if "$(MSLU)" == "1"\r
 __MSLU_DEFINE_p_1 = -dwxUSE_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 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r

 !if "$(USE_CAIRO)" == "1"\r
 ____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo\r
 !endif\r
 !if "$(USE_CAIRO)" == "1"\r
 ____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo\r
 !endif\r


@@ -190,9 +190,6 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !if "$(MSLU)" == "1"\r
 __UNICOWS_LIB_p = unicows.lib\r
 !endif\r
 !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
 !if "$(USE_CAIRO)" == "1"\r
 __CAIRO_LIB_p = cairo.lib\r
 !endif\r


@@ -234,12 +231,12 @@ clean:
 \r
 $(OBJS)\validate.exe: $(VALIDATE_OBJECTS)  $(OBJS)\validate_sample.res\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
 \r
 $(OBJS)\validate.exe: $(VALIDATE_OBJECTS)  $(OBJS)\validate_sample.res\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       c0w32.obj $(VALIDATE_OBJECTS),$@,, $(__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) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\validate_sample.res\r
+       c0w32.obj $(VALIDATE_OBJECTS),$@,, $(__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) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\validate_sample.res\r

 |\r
 \r
 $(OBJS)\validate_validate.obj: .\validate.cpp\r
        $(CXX) -q -c -P -o$@ $(VALIDATE_CXXFLAGS) .\validate.cpp\r
 \r
 $(OBJS)\validate_sample.res: .\..\sample.rc\r
 |\r
 \r
 $(OBJS)\validate_validate.obj: .\validate.cpp\r
        $(CXX) -q -c -P -o$@ $(VALIDATE_CXXFLAGS) .\validate.cpp\r
 \r
 $(OBJS)\validate_sample.res: .\..\sample.rc\r

-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) -i.\..\..\samples -dNOPCH .\..\sample.rc\r
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -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) -i.\..\..\samples -dNOPCH .\..\sample.rc\r

 \r
 \r