Misc. corrections

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

diff --git a/samples/multimon/makefile.gcc b/samples/multimon/makefile.gcc
index f75093449c71c2b0343187ff2364f6b70bd24e88..fa41a7fb4fd770dc5fd22e076ffb16750df0546f 100644 (file)
--- a/samples/multimon/makefile.gcc
+++ b/samples/multimon/makefile.gcc
@@ -18,7 +18,8 @@ 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 \
        $(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)
+       -I.\..\..\src\regex -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) \
+       -I..\..\samples $(CXXFLAGS)

 MULTIMON_TEST_OBJECTS =  \
        $(OBJS)\multimon_test_sample_rc.o \
        $(OBJS)\multimon_test_multimon_test.o
 MULTIMON_TEST_OBJECTS =  \
        $(OBJS)\multimon_test_sample_rc.o \
        $(OBJS)\multimon_test_multimon_test.o


@@ -112,6 +113,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif

+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif

 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif


@@ -130,8 +134,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
 __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):
 
 all: $(OBJS)
 $(OBJS):


@@ -145,13 +147,13 @@ $(OBJS)\multimon_test_multimon_test.o: .\multimon_test.cpp
        $(CXX) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $<
 
 $(OBJS)\multimon_test_sample_rc.o: .\..\..\samples\sample.rc
        $(CXX) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $<
 
 $(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)
+       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) --include-dir ../../samples

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\multimon_test.exe del $(OBJS)\multimon_test.exe
 
 $(OBJS)\multimon_test.exe: $(MULTIMON_TEST_OBJECTS) $(OBJS)\multimon_test_sample_rc.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\multimon_test.exe del $(OBJS)\multimon_test.exe
 
 $(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
+       $(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)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

 
 .PHONY: all clean
 
 .PHONY: all clean