preparing for fix to OSX problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
4574209d7a
commit
9feb77164b
@ -77,7 +77,7 @@
|
||||
wx/msw/winundef.h
|
||||
</set>
|
||||
|
||||
<set var="BASE_MAC_SRC">
|
||||
<set var="BASE_DARWIN_SRC">
|
||||
src/unix/baseunix.cpp
|
||||
src/unix/dir.cpp
|
||||
src/mac/gsocket.c
|
||||
@ -85,6 +85,20 @@
|
||||
src/mac/utils.cpp
|
||||
src/mac/utilsexc.cpp
|
||||
</set>
|
||||
<set var="BASE_AND_GUI_DARWIN_SRC">
|
||||
src/unix/utilsunx.cpp
|
||||
</set>
|
||||
<set var="BASE_DARWIN_HDR">
|
||||
</set>
|
||||
|
||||
<set var="BASE_MAC_SRC">
|
||||
src/unix/baseunix.cpp
|
||||
src/mac/dirmac.cpp
|
||||
src/mac/gsocket.c
|
||||
src/mac/mimetmac.cpp
|
||||
src/mac/utils.cpp
|
||||
src/mac/utilsexc.cpp
|
||||
</set>
|
||||
<set var="BASE_AND_GUI_MAC_SRC">
|
||||
src/unix/utilsunx.cpp
|
||||
</set>
|
||||
@ -1717,18 +1731,23 @@
|
||||
|
||||
<set var="BASE_PLATFORM_SRC">
|
||||
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">$(BASE_MAC_SRC)</if>
|
||||
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
|
||||
<!-- FIXME: this should really be
|
||||
PLATFORM_MACOSX==1 && TOOLKIT{=='MAC',!='MAC'} -->
|
||||
<if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
|
||||
</set>
|
||||
<set var="BASE_AND_GUI_PLATFORM_SRC">
|
||||
<if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_MAC_SRC)</if>
|
||||
<if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
|
||||
<if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(BASE_AND_GUI_DARWIN_SRC)</if>
|
||||
</set>
|
||||
<set var="BASE_PLATFORM_HDR">
|
||||
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
|
||||
<if cond="PLATFORM_MACOSX=='1'">$(BASE_MAC_HDR)</if>
|
||||
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR)</if>
|
||||
<if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
|
||||
<if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_HDR)</if>
|
||||
</set>
|
||||
|
||||
<set var="BASE_SRC">
|
||||
@ -1759,7 +1778,6 @@
|
||||
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
|
||||
<if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
|
||||
</set>
|
||||
|
||||
|
||||
<set var="GUI_SRC">
|
||||
<if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
|
||||
|
Loading…
Reference in New Issue
Block a user