1. added wxAdvanced
2. fixed setup.h creation in VC++ projects 3. temporarily disable GUI sockets code in non-msw ports so that they link git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
12f190b09c
commit
13cb46e0b6
5 changed files with 94 additions and 43 deletions
|
|
@ -23,6 +23,7 @@
|
|||
<define>wxUSE_GUI=0</define>
|
||||
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
|
||||
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
|
||||
<msvc-copy-setup-h/>
|
||||
</lib>
|
||||
|
||||
|
||||
|
|
@ -68,6 +69,27 @@
|
|||
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
|
||||
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
|
||||
</lib>
|
||||
|
||||
|
||||
<!-- ================================================================= -->
|
||||
<!-- "Advanced" controls library -->
|
||||
<!-- ================================================================= -->
|
||||
|
||||
<dll id="advdll" template="wx_dll"
|
||||
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
|
||||
<define>WXUSINGDLL</define>
|
||||
<define>WXMAKINGDLL_ADV</define>
|
||||
<sources>$(ADVANCED_SRC)</sources>
|
||||
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
|
||||
<library>coredll</library>
|
||||
<library>basedll</library>
|
||||
</dll>
|
||||
|
||||
<lib id="advlib" template="wx_lib"
|
||||
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
|
||||
<sources>$(ADVANCED_SRC)</sources>
|
||||
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
|
||||
</lib>
|
||||
|
||||
|
||||
<!-- ================================================================ -->
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue