compilation fix

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

diff --git a/samples/multimon/makefile.gcc b/samples/multimon/makefile.gcc
index 3a6974b18b1a04f0275e280b2acc2cb5c5a14571..f75093449c71c2b0343187ff2364f6b70bd24e88 100644 (file)
--- a/samples/multimon/makefile.gcc
+++ b/samples/multimon/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!
@@ -14,14 +14,14 @@ include ../../build/config.gcc
 
 LIBDIRNAME = \
        .\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-MULTIMON_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(LIBDIRNAME) -I.\..\..\src\tiff \
-       -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex \
-       -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
-MULTIMON_OBJECTS =  \
-       $(OBJS)\multimon_multimon.o \
-       $(OBJS)\multimon_multimon_rc.o
+MULTIMON_TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(LIBDIRNAME) \
+       -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib \
+       -I.\..\..\src\regex -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
+MULTIMON_TEST_OBJECTS =  \
+       $(OBJS)\multimon_test_sample_rc.o \
+       $(OBJS)\multimon_test_multimon_test.o
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
@@ -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):
@@ -137,19 +139,19 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\multimon.exe
+all: $(OBJS)\multimon_test.exe
 
-$(OBJS)\multimon_multimon.o: .\multimon.cpp
-       $(CXX) -c -o $@ $(MULTIMON_CXXFLAGS) $<
+$(OBJS)\multimon_test_multimon_test.o: .\multimon_test.cpp
+       $(CXX) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $<
 
-$(OBJS)\multimon_multimon_rc.o: .\multimon.rc
+$(OBJS)\multimon_test_sample_rc.o: .\..\..\samples\sample.rc
        windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(LIBDIRNAME) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib  --include-dir ./../../src/regex --include-dir ./../../src/expat/lib --include-dir . $(__DLLFLAG_p_1)
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
-       -if exist $(OBJS)\multimon.exe del $(OBJS)\multimon.exe
+       -if exist $(OBJS)\multimon_test.exe del $(OBJS)\multimon_test.exe
 
-$(OBJS)\multimon.exe: $(MULTIMON_OBJECTS) $(OBJS)\multimon_multimon_rc.o
-       $(CXX) -o $@ $(MULTIMON_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+$(OBJS)\multimon_test.exe: $(MULTIMON_TEST_OBJECTS) $(OBJS)\multimon_test_sample_rc.o
+       $(CXX) -o $@ $(MULTIMON_TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 
 .PHONY: all clean