expat must be added to the template, not generated wxWindows.dsp

[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 e2a2098b150c0ebf072b86b2615d4827b62fed64..fc461011a6d4c4f1b70663bf20cfbe4a9fa10f7a 100644 (file)
--- a/contrib/samples/deprecated/treelay/makefile.gcc
+++ b/contrib/samples/deprecated/treelay/makefile.gcc
@@ -21,8 +21,8 @@ TREELAY_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(LIBDIRNAME) \
        -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg -I.\..\..\..\..\src\png \
        -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
        $(__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.\..\..\..\include \
-       $(CXXFLAGS)
+       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\..\samples \
+       -I.\..\..\..\include $(CXXFLAGS)

 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.o \
        $(OBJS)\treelay_treelay_rc.o
 TREELAY_OBJECTS =  \
        $(OBJS)\treelay_treelay.o \
        $(OBJS)\treelay_treelay_rc.o


@@ -114,6 +114,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


@@ -132,8 +135,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):


@@ -147,13 +148,13 @@ $(OBJS)\treelay_treelay.o: .\treelay.cpp
        $(CXX) -c -o $@ $(TREELAY_CXXFLAGS) $<
 
 $(OBJS)\treelay_treelay_rc.o: .\treelay.rc
        $(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 $(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 ./../../../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 $(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 --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
 
 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)  -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
 
 .PHONY: all clean