change MSW libs directories so that libraries are shared by builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -12,15 +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) | ||||
| WIZARD_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 $(CXXFLAGS) | ||||
| 	$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ | ||||
| 	-I.\..\..\samples $(CXXFLAGS) | ||||
| WIZARD_OBJECTS =  \ | ||||
| 	$(OBJS)\wizard_wizard.o \ | ||||
| 	$(OBJS)\wizard_wizard_rc.o | ||||
| @@ -30,6 +29,12 @@ WIZARD_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 | ||||
| @@ -150,13 +155,13 @@ $(OBJS)\wizard_wizard.o: .\wizard.cpp | ||||
| 	$(CXX) -c -o $@ $(WIZARD_CXXFLAGS) $< | ||||
|  | ||||
| $(OBJS)\wizard_wizard_rc.o: .\wizard.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 | ||||
| 	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)\wizard.exe del $(OBJS)\wizard.exe | ||||
|  | ||||
| $(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard_rc.o | ||||
| 	$(CXX) -o $@ $(WIZARD_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_ADV_p) $(__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 $@ $(WIZARD_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_ADV_p) $(__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 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user