X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2265a2d51e3338353aeaa56f8d7521d7993342f7..0e2ff612070d7df3e36d786c213b14a8fd97a83b:/contrib/samples/deprecated/treelay/makefile.gcc diff --git a/contrib/samples/deprecated/treelay/makefile.gcc b/contrib/samples/deprecated/treelay/makefile.gcc index fc461011a6..d02aed03e7 100644 --- a/contrib/samples/deprecated/treelay/makefile.gcc +++ b/contrib/samples/deprecated/treelay/makefile.gcc @@ -12,17 +12,14 @@ include ../../../../build/msw/config.gcc ### Variables: ### -LIBDIRNAME = \ - .\..\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +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$(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 \ - -I.\..\..\..\include $(CXXFLAGS) + $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) TREELAY_OBJECTS = \ $(OBJS)\treelay_treelay.o \ $(OBJS)\treelay_treelay_rc.o @@ -32,6 +29,12 @@ TREELAY_OBJECTS = \ 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 @@ -109,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 @@ -144,17 +147,17 @@ $(OBJS): all: $(OBJS)\treelay.exe -$(OBJS)\treelay_treelay.o: .\treelay.cpp +$(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 $(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 +$(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 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