Fixed indetation error

[wxWidgets.git] / build / msw / makefile.bcc

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 9355363477ad92ec1d7a5ad4b7bc8d1a32909257..ea64dff0cee7c8bbcee9e6e7a5b59658bda6fe10 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -236,6 +236,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_main.obj \
        $(OBJS)\baselib_mslu.obj \
        $(OBJS)\baselib_volume.obj
+BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg
 COREDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
@@ -731,7 +732,8 @@ WXPNG_OBJECTS =  \
        $(OBJS)\wxpng_pngwtran.obj \
        $(OBJS)\wxpng_pngwutil.obj
 WXREGEX_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
-       $(__OPTIMIZEFLAG) -tWM -w-8004 -w-8012 -w-8057 -w-8066 $(CPPFLAGS) $(CFLAGS)
+       $(__OPTIMIZEFLAG) -tWM -I..\..\include -I$(SETUPHDIR) -w-8004 -w-8012 -w-8057 \
+       -w-8066 $(CPPFLAGS) $(CFLAGS)
 WXREGEX_OBJECTS =  \
        $(OBJS)\wxregex_regcomp.obj \
        $(OBJS)\wxregex_regexec.obj \
@@ -1046,6 +1048,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fontmap.obj \
        $(OBJS)\monolib_framecmn.obj \
        $(OBJS)\monolib_gaugecmn.obj \
+       $(OBJS)\monolib_gbsizer.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \
        $(OBJS)\monolib_gifdecod.obj \
@@ -1240,6 +1243,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fontmap.obj \
        $(OBJS)\monolib_framecmn.obj \
        $(OBJS)\monolib_gaugecmn.obj \
+       $(OBJS)\monolib_gbsizer.obj \
        $(OBJS)\monolib_gdicmn.obj \
        $(OBJS)\monolib_geometry.obj \
        $(OBJS)\monolib_gifdecod.obj \
@@ -1432,6 +1436,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fontmap.obj \
        $(OBJS)\coredll_framecmn.obj \
        $(OBJS)\coredll_gaugecmn.obj \
+       $(OBJS)\coredll_gbsizer.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \
        $(OBJS)\coredll_gifdecod.obj \
@@ -1626,6 +1631,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fontmap.obj \
        $(OBJS)\coredll_framecmn.obj \
        $(OBJS)\coredll_gaugecmn.obj \
+       $(OBJS)\coredll_gbsizer.obj \
        $(OBJS)\coredll_gdicmn.obj \
        $(OBJS)\coredll_geometry.obj \
        $(OBJS)\coredll_gifdecod.obj \
@@ -1818,6 +1824,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fontmap.obj \
        $(OBJS)\corelib_framecmn.obj \
        $(OBJS)\corelib_gaugecmn.obj \
+       $(OBJS)\corelib_gbsizer.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \
        $(OBJS)\corelib_gifdecod.obj \
@@ -2012,6 +2019,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fontmap.obj \
        $(OBJS)\corelib_framecmn.obj \
        $(OBJS)\corelib_gaugecmn.obj \
+       $(OBJS)\corelib_gbsizer.obj \
        $(OBJS)\corelib_gdicmn.obj \
        $(OBJS)\corelib_geometry.obj \
        $(OBJS)\corelib_gifdecod.obj \
@@ -2204,6 +2212,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fontmap.obj \
        $(OBJS)\monodll_framecmn.obj \
        $(OBJS)\monodll_gaugecmn.obj \
+       $(OBJS)\monodll_gbsizer.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \
        $(OBJS)\monodll_gifdecod.obj \
@@ -2398,6 +2407,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fontmap.obj \
        $(OBJS)\monodll_framecmn.obj \
        $(OBJS)\monodll_gaugecmn.obj \
+       $(OBJS)\monodll_gbsizer.obj \
        $(OBJS)\monodll_gdicmn.obj \
        $(OBJS)\monodll_geometry.obj \
        $(OBJS)\monodll_gifdecod.obj \
@@ -3642,6 +3652,11 @@ $(OBJS)\coredll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_gbsizer.obj: ..\..\src\common\gbsizer.cpp
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_gdicmn.obj: ..\..\src\common\gdicmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -4763,6 +4778,11 @@ $(OBJS)\corelib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_gbsizer.obj: ..\..\src\common\gbsizer.cpp
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_gdicmn.obj: ..\..\src\common\gdicmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -6139,6 +6159,11 @@ $(OBJS)\monodll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_gbsizer.obj: ..\..\src\common\gbsizer.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_gdicmn.obj: ..\..\src\common\gdicmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7611,6 +7636,11 @@ $(OBJS)\monolib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_gbsizer.obj: ..\..\src\common\gbsizer.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_gdicmn.obj: ..\..\src\common\gdicmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -9022,34 +9052,34 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(OBJS)\baselib_dummy.
 |
 !endif
 
-build_cfg_file: $(LIBDIRNAME)
-       @echo WXVER_MAJOR=2 >$(LIBDIRNAME)\build.cfg
-       @echo WXVER_MINOR=5 >>$(LIBDIRNAME)\build.cfg
-       @echo WXVER_RELEASE=1 >>$(LIBDIRNAME)\build.cfg
-       @echo BUILD=$(BUILD) >>$(LIBDIRNAME)\build.cfg
-       @echo MONOLITHIC=$(MONOLITHIC) >>$(LIBDIRNAME)\build.cfg
-       @echo SHARED=$(SHARED) >>$(LIBDIRNAME)\build.cfg
-       @echo UNICODE=$(UNICODE) >>$(LIBDIRNAME)\build.cfg
-       @echo WXUNIV=$(WXUNIV) >>$(LIBDIRNAME)\build.cfg
-       @echo CFG=$(CFG) >>$(LIBDIRNAME)\build.cfg
-       @echo VENDOR=$(VENDOR) >>$(LIBDIRNAME)\build.cfg
-       @echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(LIBDIRNAME)\build.cfg
-       @echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(LIBDIRNAME)\build.cfg
-       @echo DEBUG_INFO=$(DEBUG_INFO) >>$(LIBDIRNAME)\build.cfg
-       @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(LIBDIRNAME)\build.cfg
-       @echo MSLU=$(MSLU) >>$(LIBDIRNAME)\build.cfg
-       @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(LIBDIRNAME)\build.cfg
-       @echo USE_GUI=$(USE_GUI) >>$(LIBDIRNAME)\build.cfg
-       @echo USE_HTML=$(USE_HTML) >>$(LIBDIRNAME)\build.cfg
-       @echo USE_ODBC=$(USE_ODBC) >>$(LIBDIRNAME)\build.cfg
-       @echo USE_OPENGL=$(USE_OPENGL) >>$(LIBDIRNAME)\build.cfg
-       @echo COMPILER=bcc >>$(LIBDIRNAME)\build.cfg
-       @echo CC=$(CC) >>$(LIBDIRNAME)\build.cfg
-       @echo CXX=$(CXX) >>$(LIBDIRNAME)\build.cfg
-       @echo CFLAGS=$(CFLAGS) >>$(LIBDIRNAME)\build.cfg
-       @echo CPPFLAGS=$(CPPFLAGS) >>$(LIBDIRNAME)\build.cfg
-       @echo CXXFLAGS=$(CXXFLAGS) >>$(LIBDIRNAME)\build.cfg
-       @echo LDFLAGS=$(LDFLAGS) >>$(LIBDIRNAME)\build.cfg
+build_cfg_file: $(SETUPHDIR)
+       @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
+       @echo WXVER_MINOR=5 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
+       @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
+       @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
+       @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
+       @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)
+       @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)
+       @echo CFG=$(CFG) >>$(BUILD_CFG_FILE)
+       @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)
+       @echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE)
+       @echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE)
+       @echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE)
+       @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
+       @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
+       @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
+       @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
+       @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
+       @echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
+       @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
+       @echo COMPILER=bcc >>$(BUILD_CFG_FILE)
+       @echo CC=$(CC) >>$(BUILD_CFG_FILE)
+       @echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
+       @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
+       @echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE)
+       @echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE)
+       @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE)
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj