Somehow, setting a tint color makes gauge work :/.

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

diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc
index a23208b26a7f9b1e286c9293bccfd7a5fdf5672a..83b3d2fdc636b1308fbfc8e20b1bb5a3707d5d0c 100644 (file)
--- a/samples/render/makefile.bcc
+++ b/samples/render/makefile.bcc
@@ -21,13 +21,12 @@ BCCDIR = $(MAKEDIR)\..
 \r
 ### Variables: ###\r
 \r
 \r
 ### Variables: ###\r
 \r

-WX_RELEASE_NODOT = 29\r
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_RELEASE_NODOT = 30\r

 COMPILER_PREFIX = bcc\r
 OBJS = \\r
 COMPILER_PREFIX = bcc\r
 OBJS = \\r

-       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = \
-       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
+LIBDIRNAME = \\r
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r

 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 RENDER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 RENDER_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r


@@ -54,17 +53,17 @@ RENDDLL_OBJECTS =  \
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

-PORTNAME = msw\r
-!endif\r
-!if "$(OFFICIAL_BUILD)" == "1"
-COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
-!endif
-!if "$(OFFICIAL_BUILD)" == "0"
-WXCOMPILER = _bcc
-!endif
-!if "$(OFFICIAL_BUILD)" == "1"
-WXCOMPILER = _bcc$(COMPILER_VERSION)
-!endif
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "0"\r
+WXCOMPILER = _bcc\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+WXCOMPILER = _bcc$(COMPILER_VERSION)\r
+!endif\r

 !if "$(BUILD)" == "debug"\r
 WXDEBUGFLAG = d\r
 !endif\r
 !if "$(BUILD)" == "debug"\r
 WXDEBUGFLAG = d\r
 !endif\r


@@ -127,7 +126,7 @@ __DLLFLAG_p_1 = -dWXUSINGDLL
 !endif\r
 !if "$(SHARED)" == "1"\r
 __renddll___depname = \\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 __renddll___depname = \\r

-       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll
+       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).dll\r

 !endif\r
 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG = -Od\r
 !endif\r
 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG = -Od\r


@@ -201,6 +200,9 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r

+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"\r
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r

 !if "$(USE_GUI)" == "1"\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
 !endif\r


@@ -251,22 +253,22 @@ clean:
        -if exist $(OBJS)\render.ild del $(OBJS)\render.ild\r
        -if exist $(OBJS)\render.ilf del $(OBJS)\render.ilf\r
        -if exist $(OBJS)\render.ils del $(OBJS)\render.ils\r
        -if exist $(OBJS)\render.ild del $(OBJS)\render.ild\r
        -if exist $(OBJS)\render.ilf del $(OBJS)\render.ilf\r
        -if exist $(OBJS)\render.ils del $(OBJS)\render.ils\r

-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).tds del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).tds
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).ilc del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).ilc
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).ild del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).ild
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).ilf del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).ilf
-       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).ils del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).ils
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).dll\r
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).tds del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).tds\r
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).ilc del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).ilc\r
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).ild del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).ild\r
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).ilf del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).ilf\r
+       -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).ils del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).ils\r

 \r
 $(OBJS)\render.exe: $(RENDER_OBJECTS)  $(OBJS)\render_sample.res\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r
 \r
 $(OBJS)\render.exe: $(RENDER_OBJECTS)  $(OBJS)\render_sample.res\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r

-       c0w32.obj $(RENDER_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)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\render_sample.res\r
+       c0w32.obj $(RENDER_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_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)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\render_sample.res\r

 |\r
 \r
 !if "$(SHARED)" == "1"\r
 |\r
 \r
 !if "$(SHARED)" == "1"\r

-$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll: $(RENDDLL_OBJECTS)
+$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)$(WXCOMPILER).dll: $(RENDDLL_OBJECTS)\r

        ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r
        ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r

-       c0d32.obj $(RENDDLL_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)$(__RUNTIME_LIBS_0).lib,,\r
+       c0d32.obj $(RENDDLL_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_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)$(__RUNTIME_LIBS_0).lib,,\r

 |\r
 !endif\r
 \r
 |\r
 !endif\r
 \r