Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change MSW libs directories so that libraries are shared by builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-15 22:08:13 +00:00
parent 3df38e2077
commit 75a0a7b7de
756 changed files with 19931 additions and 21915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/build/net/makefile.vc
View File

@@ -12,18 +12,13 @@
### Variables: ###
LIBDIRNAME = \
..\..\src\net\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
NETUTILSDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).pdb \
$(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\net\..\..\..\include \
/I$(LIBDIRNAME) /I..\..\src\net\..\..\..\src\tiff \
/I..\..\src\net\..\..\..\src\jpeg /I..\..\src\net\..\..\..\src\png \
/I..\..\src\net\..\..\..\src\zlib /I..\..\src\net\..\..\..\src\regex \
/I..\..\src\net\..\..\..\src\expat\lib /I..\..\src\net\..\..\include \
/DWXUSINGDLL /DWXMAKINGDLL_NETUTILS $(CXXFLAGS) /Yu"wx/wxprec.h" \
/I$(SETUPHDIR) /I..\..\src\net\..\..\include /DWXUSINGDLL \
/DWXMAKINGDLL_NETUTILS $(CXXFLAGS) /Yu"wx/wxprec.h" \
/Fp"$(OBJS)\wxprec_netutilsdll.pch"
NETUTILSDLL_OBJECTS = \
$(OBJS)\netutilsdll_dummy.obj \
@@ -35,11 +30,8 @@ NETUTILSLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.pdb \
$(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I..\..\src\net\..\..\..\include \
/I$(LIBDIRNAME) /I..\..\src\net\..\..\..\src\tiff \
/I..\..\src\net\..\..\..\src\jpeg /I..\..\src\net\..\..\..\src\png \
/I..\..\src\net\..\..\..\src\zlib /I..\..\src\net\..\..\..\src\regex \
/I..\..\src\net\..\..\..\src\expat\lib /I..\..\src\net\..\..\include \
$(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netutilslib.pch"
/I$(SETUPHDIR) /I..\..\src\net\..\..\include $(CXXFLAGS) /Yu"wx/wxprec.h" \
/Fp"$(OBJS)\wxprec_netutilslib.pch"
NETUTILSLIB_OBJECTS = \
$(OBJS)\netutilslib_dummy.obj \
$(OBJS)\netutilslib_email.obj \
@@ -47,9 +39,17 @@ NETUTILSLIB_OBJECTS = \
$(OBJS)\netutilslib_web.obj
OBJS = \
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
### Conditionally set variables: ###
!if "$(SHARED)" == "0"
LIBDIRNAME = ..\..\src\net\..\..\..\lib\vc_lib$(CFG)
!endif
!if "$(SHARED)" == "1"
LIBDIRNAME = ..\..\src\net\..\..\..\lib\vc_dll$(CFG)
!endif
!if "$(USE_GUI)" == "0"
PORTNAME = base
!endif
@@ -258,14 +258,14 @@ clean:
-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib
!if "$(SHARED)" == "1"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).dll: $(NETUTILSDLL_OBJECTS) $(OBJS)\netutilsdll_dummy.obj
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils_vc$(VENDORTAG).dll: $(OBJS)\netutilsdll_dummy.obj $(NETUTILSDLL_OBJECTS)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) @<<
$(NETUTILSDLL_OBJECTS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) 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 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib
<<
!endif
!if "$(SHARED)" == "0"
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib: $(NETUTILSLIB_OBJECTS) $(OBJS)\netutilslib_dummy.obj
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils.lib: $(OBJS)\netutilslib_dummy.obj $(NETUTILSLIB_OBJECTS)
if exist $@ del $@
lib /NOLOGO /OUT:$@ @<<
$(NETUTILSLIB_OBJECTS)