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
|
||||
@@ -153,16 +160,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)
|
||||
VALIDATE_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)
|
||||
VALIDATE_OBJECTS = &
|
||||
$(OBJS)\validate_validate.obj
|
||||
|
||||
@@ -179,7 +184,7 @@ $(OBJS)\validate_validate.obj : .AUTODEPEND .\validate.cpp
|
||||
$(CXX) -zq -fo=$^@ $(VALIDATE_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\validate_validate.res : .AUTODEPEND .\validate.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
|
||||
@@ -192,7 +197,7 @@ $(OBJS)\validate.exe : $(VALIDATE_OBJECTS) $(OBJS)\validate_validate.res
|
||||
@%create $(OBJS)\validate.lbc
|
||||
@%append $(OBJS)\validate.lbc option quiet
|
||||
@%append $(OBJS)\validate.lbc name $^@
|
||||
@%append $(OBJS)\validate.lbc option incremental
|
||||
@%append $(OBJS)\validate.lbc option caseexact
|
||||
@%append $(OBJS)\validate.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@for %i in ($(VALIDATE_OBJECTS)) do @%append $(OBJS)\validate.lbc file %i
|
||||
@for %i in ( $(__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)\validate.lbc library %i
|
||||
|
Reference in New Issue
Block a user