removed old copy (?) of the file which is now in build/msw

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

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index b7d37a87fcf397d4d9e422b8217a25a315a01cc1..483798a2f8fa6db1e10ef94b881bc551cef4a0c3 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -225,6 +225,7 @@ BASELIB_OBJECTS =  \
        $(OBJS)\baselib_main.o \
        $(OBJS)\baselib_mslu.o \
        $(OBJS)\baselib_volume.o
+BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg
 COREDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
        -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
        -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \
@@ -1040,6 +1041,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fontmap.o \
        $(OBJS)\monolib_framecmn.o \
        $(OBJS)\monolib_gaugecmn.o \
+       $(OBJS)\monolib_gbsizer.o \
        $(OBJS)\monolib_gdicmn.o \
        $(OBJS)\monolib_geometry.o \
        $(OBJS)\monolib_gifdecod.o \
@@ -1236,6 +1238,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_fontmap.o \
        $(OBJS)\monolib_framecmn.o \
        $(OBJS)\monolib_gaugecmn.o \
+       $(OBJS)\monolib_gbsizer.o \
        $(OBJS)\monolib_gdicmn.o \
        $(OBJS)\monolib_geometry.o \
        $(OBJS)\monolib_gifdecod.o \
@@ -1430,6 +1433,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fontmap.o \
        $(OBJS)\coredll_framecmn.o \
        $(OBJS)\coredll_gaugecmn.o \
+       $(OBJS)\coredll_gbsizer.o \
        $(OBJS)\coredll_gdicmn.o \
        $(OBJS)\coredll_geometry.o \
        $(OBJS)\coredll_gifdecod.o \
@@ -1626,6 +1630,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_fontmap.o \
        $(OBJS)\coredll_framecmn.o \
        $(OBJS)\coredll_gaugecmn.o \
+       $(OBJS)\coredll_gbsizer.o \
        $(OBJS)\coredll_gdicmn.o \
        $(OBJS)\coredll_geometry.o \
        $(OBJS)\coredll_gifdecod.o \
@@ -1820,6 +1825,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fontmap.o \
        $(OBJS)\corelib_framecmn.o \
        $(OBJS)\corelib_gaugecmn.o \
+       $(OBJS)\corelib_gbsizer.o \
        $(OBJS)\corelib_gdicmn.o \
        $(OBJS)\corelib_geometry.o \
        $(OBJS)\corelib_gifdecod.o \
@@ -2016,6 +2022,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_fontmap.o \
        $(OBJS)\corelib_framecmn.o \
        $(OBJS)\corelib_gaugecmn.o \
+       $(OBJS)\corelib_gbsizer.o \
        $(OBJS)\corelib_gdicmn.o \
        $(OBJS)\corelib_geometry.o \
        $(OBJS)\corelib_gifdecod.o \
@@ -2210,6 +2217,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fontmap.o \
        $(OBJS)\monodll_framecmn.o \
        $(OBJS)\monodll_gaugecmn.o \
+       $(OBJS)\monodll_gbsizer.o \
        $(OBJS)\monodll_gdicmn.o \
        $(OBJS)\monodll_geometry.o \
        $(OBJS)\monodll_gifdecod.o \
@@ -2406,6 +2414,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_fontmap.o \
        $(OBJS)\monodll_framecmn.o \
        $(OBJS)\monodll_gaugecmn.o \
+       $(OBJS)\monodll_gbsizer.o \
        $(OBJS)\monodll_gdicmn.o \
        $(OBJS)\monodll_geometry.o \
        $(OBJS)\monodll_gifdecod.o \
@@ -3759,6 +3768,11 @@ $(OBJS)\coredll_gaugecmn.o: ../../src/common/gaugecmn.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_gbsizer.o: ../../src/common/gbsizer.cpp
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_gdicmn.o: ../../src/common/gdicmn.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -4980,6 +4994,11 @@ $(OBJS)\corelib_gaugecmn.o: ../../src/common/gaugecmn.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_gbsizer.o: ../../src/common/gbsizer.cpp
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_gdicmn.o: ../../src/common/gdicmn.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -6456,6 +6475,11 @@ $(OBJS)\monodll_gaugecmn.o: ../../src/common/gaugecmn.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_gbsizer.o: ../../src/common/gbsizer.cpp
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_gdicmn.o: ../../src/common/gdicmn.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -8028,6 +8052,11 @@ $(OBJS)\monolib_gaugecmn.o: ../../src/common/gaugecmn.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 endif
 
+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_gbsizer.o: ../../src/common/gbsizer.cpp
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_gdicmn.o: ../../src/common/gdicmn.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -9503,34 +9532,34 @@ $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(BASELIB_OBJECTS)
 endif
 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=gcc >>$(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=gcc >>$(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)\*.o del $(OBJS)\*.o
@@ -9779,4 +9808,4 @@ $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS)
 endif
 endif
 
-.PHONY: all clean samples setup_h
+.PHONY: all build_cfg_file clean samples setup_h