X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25a73439590e04730168bee6b691bd6233880ad4..4547faae1dbfbeffb584c1b16b8dd50d1edf26cd:/samples/nativdlg/makefile.gcc?ds=inline diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc index d091ae6831..a40a06cf84 100644 --- a/samples/nativdlg/makefile.gcc +++ b/samples/nativdlg/makefile.gcc @@ -4,7 +4,7 @@ # Do not modify, all changes will be overwritten! # ========================================================================= -include ../../build/config.gcc +include ../../build/msw/config.gcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -12,24 +12,29 @@ include ../../build/config.gcc ### Variables: ### -LIBDIRNAME = \ - .\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) NATIVDLG_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) $(CXXFLAGS) + $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) NATIVDLG_OBJECTS = \ $(OBJS)\nativdlg_nativdlg.o \ $(OBJS)\nativdlg_nativdlg_rc.o OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) ### Conditionally set variables: ### 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 @@ -107,10 +112,13 @@ 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 endif ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) @@ -139,17 +147,17 @@ $(OBJS): all: $(OBJS)\nativdlg.exe -$(OBJS)\nativdlg_nativdlg.o: .\nativdlg.cpp +$(OBJS)\nativdlg_nativdlg.o: ./nativdlg.cpp $(CXX) -c -o $@ $(NATIVDLG_CXXFLAGS) $< -$(OBJS)\nativdlg_nativdlg_rc.o: .\nativdlg.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) +$(OBJS)\nativdlg_nativdlg_rc.o: ./nativdlg.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 clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe $(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg_rc.o - $(CXX) -o $@ $(NATIVDLG_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 $@ $(NATIVDLG_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