Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/wxtest/makefile.gcc b/samples/wxtest/makefile.gcc
index 15282a1b9ba190b9e173dcfe226060fc5f6cb731..c3082968d2734affdb607036ff10dd982db7491c 100644 (file)
--- a/samples/wxtest/makefile.gcc
+++ b/samples/wxtest/makefile.gcc
@@ -12,15 +12,15 @@ include ../../build/msw/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-LIBDIRNAME = \
-       .\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

-WXTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+WXTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \

        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        -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) -I..\..\samples $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \
+       $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)

 WXTEST_OBJECTS =  \
        $(OBJS)\wxtest_sample_rc.o \
        $(OBJS)\wxtest_test.o \
 WXTEST_OBJECTS =  \
        $(OBJS)\wxtest_sample_rc.o \
        $(OBJS)\wxtest_test.o \


@@ -31,6 +31,12 @@ WXTEST_OBJECTS =  \
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif

+ifeq ($(SHARED),0)
+LIBDIRNAME = .\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = .\..\..\lib\gcc_dll$(CFG)
+endif

 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif


@@ -92,6 +98,18 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif

+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_4 = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_4 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_5 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_5 = 
+endif

 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif


@@ -108,10 +126,10 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG_2 = -O2
 endif
 ifeq ($(UNICODE),1)
 __OPTIMIZEFLAG_2 = -O2
 endif
 ifeq ($(UNICODE),1)

-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE

 endif
 ifeq ($(UNICODE),1)
 endif
 ifeq ($(UNICODE),1)

-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = --define _UNICODE

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


@@ -143,13 +161,13 @@ $(OBJS):
 
 all: $(OBJS)\wxtest.exe
 
 
 all: $(OBJS)\wxtest.exe
 

-$(OBJS)\wxtest_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) --include-dir ../../samples
+$(OBJS)\wxtest_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 $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples

 
 

-$(OBJS)\wxtest_test.o: .\test.cpp
+$(OBJS)\wxtest_test.o: ./test.cpp

        $(CXX) -c -o $@ $(WXTEST_CXXFLAGS) $<
 
        $(CXX) -c -o $@ $(WXTEST_CXXFLAGS) $<
 

-$(OBJS)\wxtest_test_wdr.o: .\test_wdr.cpp
+$(OBJS)\wxtest_test_wdr.o: ./test_wdr.cpp

        $(CXX) -c -o $@ $(WXTEST_CXXFLAGS) $<
 
 clean: 
        $(CXX) -c -o $@ $(WXTEST_CXXFLAGS) $<
 
 clean: 


@@ -157,6 +175,6 @@ clean:
        -if exist $(OBJS)\wxtest.exe del $(OBJS)\wxtest.exe
 
 $(OBJS)\wxtest.exe: $(WXTEST_OBJECTS) $(OBJS)\wxtest_sample_rc.o
        -if exist $(OBJS)\wxtest.exe del $(OBJS)\wxtest.exe
 
 $(OBJS)\wxtest.exe: $(WXTEST_OBJECTS) $(OBJS)\wxtest_sample_rc.o

-       $(CXX) -o $@ $(WXTEST_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
+       $(CXX) -o $@ $(WXTEST_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