use gsockosx and unix sockets when building Mach-o wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d337031039
commit
d40f26be76
@ -323,13 +323,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/unix/gsockunx.h
|
||||
</set>
|
||||
|
||||
<set var="NET_MAC_SRC" hints="files">
|
||||
src/mac/gsocket.c
|
||||
</set>
|
||||
<set var="NET_MAC_HDR" hints="files">
|
||||
wx/mac/gsockmac.h
|
||||
</set>
|
||||
|
||||
<set var="NET_OS2_SRC" hints="files">
|
||||
src/os2/gsocket.c
|
||||
</set>
|
||||
@ -1560,6 +1553,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/mac/frame.cpp
|
||||
src/mac/gauge.cpp
|
||||
src/mac/gdiobj.cpp
|
||||
src/mac/gsockosx.c
|
||||
src/mac/icon.cpp
|
||||
src/mac/listbox.cpp
|
||||
src/mac/mdi.cpp
|
||||
@ -2208,24 +2202,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
|
||||
<!-- wxNet files: -->
|
||||
<set var="NET_MACOSX_SRC" hints="files">
|
||||
<if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_SRC)</if>
|
||||
<if cond="TOOLKIT=='GTK'">$(NET_DARWIN_SRC)</if>
|
||||
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
|
||||
</set>
|
||||
<set var="NET_PLATFORM_SRC" hints="files">
|
||||
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
|
||||
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC)</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">$(NET_MACOSX_SRC)</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_SRC)</if>
|
||||
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
|
||||
</set>
|
||||
<set var="NET_PLATFORM_HDR" hints="files">
|
||||
<if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
|
||||
<if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR)</if>
|
||||
<if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
|
||||
<if cond="TOOLKIT=='MAC'">$(NET_MAC_HDR)</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_HDR)</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_HDR)</if>
|
||||
</set>
|
||||
|
||||
<set var="NET_SRC" hints="files">
|
||||
@ -2339,7 +2326,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
$(BASE_AND_GUI_MAC_SRC)
|
||||
$(BASE_AND_GUI_DARWIN_SRC)
|
||||
$(BASE_AND_GUI_WIN32_SRC)
|
||||
$(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)
|
||||
$(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC)
|
||||
$(XML_SRC) $(ODBC_SRC)
|
||||
</set>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user