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:
		| @@ -27,6 +27,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- | ||||
|  | ||||
| ### Conditionally set variables: ### | ||||
|  | ||||
| LIBDIRNAME = | ||||
| !ifeq SHARED 0 | ||||
| LIBDIRNAME = .\..\..\..\lib\wat_lib$(CFG) | ||||
| !endif | ||||
| !ifeq SHARED 1 | ||||
| LIBDIRNAME = .\..\..\..\lib\wat_dll$(CFG) | ||||
| !endif | ||||
| PORTNAME = | ||||
| !ifeq USE_GUI 0 | ||||
| PORTNAME = base | ||||
| @@ -158,16 +165,14 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ | ||||
|  | ||||
| ### Variables: ### | ||||
|  | ||||
| LIBDIRNAME = & | ||||
| 	.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| OBJS = & | ||||
| 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| SETUPHDIR = & | ||||
| 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||
| WIDGET_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & | ||||
| 	$(__RUNTIME_LIBS_5) -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) | ||||
| WIDGET_OBJECTS =  & | ||||
| 	$(OBJS)\widget_widget.obj | ||||
|  | ||||
| @@ -184,7 +189,7 @@ $(OBJS)\widget_widget.obj :  .AUTODEPEND .\widget.cpp | ||||
| 	$(CXX) -zq -fo=$^@ $(WIDGET_CXXFLAGS) $< | ||||
|  | ||||
| $(OBJS)\widget_widget.res :  .AUTODEPEND .\widget.rc | ||||
| 	wrc -q -ad -bt=nt -r -fo=$^@ -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 $< | ||||
| 	wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $< | ||||
|  | ||||
| clean : .SYMBOLIC  | ||||
| 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj | ||||
| @@ -201,7 +206,7 @@ $(OBJS)\widget.exe :  $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res | ||||
| 	@%create $(OBJS)\widget.lbc | ||||
| 	@%append $(OBJS)\widget.lbc option quiet | ||||
| 	@%append $(OBJS)\widget.lbc name $^@ | ||||
| 	@%append $(OBJS)\widget.lbc option incremental | ||||
| 	@%append $(OBJS)\widget.lbc option caseexact | ||||
| 	@%append $(OBJS)\widget.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' | ||||
| 	@for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i | ||||
| 	@for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib   kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\widget.lbc library %i | ||||
|   | ||||
		Reference in New Issue
	
	Block a user