Don't move the insertion point if text didn't change in wxTextEntry.

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

diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc
index 37a5b585bb19050e7216663aec16455664d0bd5e..cfa5af9df6ad27d333ea85bb7298c557cf0c777e 100644 (file)
--- a/samples/image/makefile.bcc
+++ b/samples/image/makefile.bcc
@@ -24,8 +24,9 @@ BCCDIR = $(MAKEDIR)\..
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = bcc\r
 OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 IMAGE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
@@ -47,6 +48,9 @@ PORTNAME = base
 !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 "$(BUILD)" == "debug"\r
 WXDEBUGFLAG = d\r
 !endif\r
@@ -69,7 +73,7 @@ LIBTYPE_SUFFIX = dll
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 !endif\r
 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG_2 = -Od\r
@@ -230,21 +234,20 @@ clean:
        -if exist $(OBJS)\image.ilf del $(OBJS)\image.ilf\r
        -if exist $(OBJS)\image.ils del $(OBJS)\image.ils\r
 \r
-$(OBJS)\image.exe: $(IMAGE_OBJECTS)  $(OBJS)\image_sample.res\r
+$(OBJS)\image.exe: $(IMAGE_OBJECTS)  $(OBJS)\image_image.res
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
-       c0w32.obj $(IMAGE_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)\image_sample.res\r
+       c0w32.obj $(IMAGE_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)\image_image.res
 |\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
 \r
-$(OBJS)\image_sample.res: .\..\..\samples\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 .\..\..\samples\sample.rc\r
-\r
 $(OBJS)\image_image.obj: .\image.cpp\r
        $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp\r
 \r
 $(OBJS)\image_canvas.obj: .\canvas.cpp\r
        $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp\r
 \r
+$(OBJS)\image_image.res: .\image.rc
+       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 .\image.rc