regenerated makefiles

[wxWidgets.git] / samples / wxtest / makefile.gcc

diff --git a/samples/wxtest/makefile.gcc b/samples/wxtest/makefile.gcc
index 29e2f48b2722c4cbeccd69be2d132b5f70c6327b..5f56aaabd4cab7e67db2119bb4dae5fac847a7fd 100644 (file)
--- a/samples/wxtest/makefile.gcc
+++ b/samples/wxtest/makefile.gcc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-include ../../build/config.gcc
+include ../../build/msw/config.gcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -22,7 +22,7 @@ WXTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex \
        -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
 WXTEST_OBJECTS =  \
-       $(OBJS)\wxtest_wxtest.o \
+       $(OBJS)\wxtest_test.o \
        $(OBJS)\wxtest_wxtest_rc.o
 
 ### Conditionally set variables: ###
@@ -130,6 +130,8 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
+MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
+
 
 all: $(OBJS)
 $(OBJS):
@@ -139,7 +141,7 @@ $(OBJS):
 
 all: $(OBJS)\wxtest.exe
 
-$(OBJS)\wxtest_wxtest.o: .\wxtest.cpp
+$(OBJS)\wxtest_test.o: .\test.cpp
        $(CXX) -c -o $@ $(WXTEST_CXXFLAGS) $<
 
 $(OBJS)\wxtest_wxtest_rc.o: .\wxtest.rc