Updated makefiles etc. for 2.5.1

[wxWidgets.git] / contrib / samples / deprecated / treelay / makefile.gcc

diff --git a/contrib/samples/deprecated/treelay/makefile.gcc b/contrib/samples/deprecated/treelay/makefile.gcc
index 5fc96c0295f946afa7c73eabd90006c575c3b408..d02aed03e74c57aba5b384e575786edea121d88f 100644 (file)
--- a/contrib/samples/deprecated/treelay/makefile.gcc
+++ b/contrib/samples/deprecated/treelay/makefile.gcc
@@ -18,7 +18,7 @@ SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 TREELAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -I. \
+       $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \
        $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS)
 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.o \
@@ -112,10 +112,10 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG_2 = -O2
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 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
@@ -151,13 +151,13 @@ $(OBJS)\treelay_treelay.o: ./treelay.cpp
        $(CXX) -c -o $@ $(TREELAY_CXXFLAGS) $<
 
 $(OBJS)\treelay_treelay_rc.o: ./treelay.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 --include-dir ./../../../include
+       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 --include-dir ./../../../include
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\treelay.exe del $(OBJS)\treelay.exe
 
 $(OBJS)\treelay.exe: $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay_rc.o
-       $(CXX) -o $@ $(TREELAY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $(__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 $@ $(TREELAY_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated  $(__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