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

Also make make dist for wxMac work

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-08-26 14:06:42 +00:00
parent 22188d7396
commit 4a693a9b8c
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.in
View File

@@ -32013,7 +32013,6 @@ BASE_DIST: ALL_DIST INTL_DIST
mkdir $(DISTDIR)/src/osx
mkdir $(DISTDIR)/src/osx/core
mkdir $(DISTDIR)/src/osx/carbon
mkdir $(DISTDIR)/src/osx/carbon/morefilex
mkdir $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/src/msw
mkdir $(DISTDIR)/src/os2
@@ -32109,16 +32108,25 @@ MOTIF_DIST: ALL_GUI_DIST
MACX_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
mkdir $(DISTDIR)/include/wx/osx/carbon
mkdir $(DISTDIR)/include/wx/osx/private
mkdir $(DISTDIR)/include/wx/osx/carbon/private
mkdir $(DISTDIR)/include/wx/osx/cocoa
mkdir $(DISTDIR)/include/wx/osx/iphone
$(CP_P) $(INCDIR)/wx/osx/*.h $(DISTDIR)/include/wx/osx
$(CP_P) $(INCDIR)/wx/osx/carbon/*.h $(DISTDIR)/include/wx/osx/carbon
$(CP_P) $(INCDIR)/wx/osx/carbon/private/*.h $(DISTDIR)/include/wx/osx/carbon/private
$(CP_P) $(INCDIR)/wx/osx/private/*.h $(DISTDIR)/include/wx/osx/private
$(CP_P) $(INCDIR)/wx/osx/cocoa/*.h $(DISTDIR)/include/wx/osx/cocoa
$(CP_P) $(INCDIR)/wx/osx/iphone/*.h $(DISTDIR)/include/wx/osx/iphone
mkdir $(DISTDIR)/include/wx/osx/core
mkdir $(DISTDIR)/include/wx/osx/core/private
$(CP_P) $(INCDIR)/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
$(CP_P) $(INCDIR)/wx/osx/core/private/*.h $(DISTDIR)/include/wx/osx/core/private
mkdir $(DISTDIR)/src/osx/core
$(CP_P) $(MACDIR)/core/*.cpp $(DISTDIR)/src/osx/core
mkdir $(DISTDIR)/src/osx/cocoa
$(CP_P) $(MACDIR)/cocoa/*.mm $(DISTDIR)/src/osx/cocoa
mkdir $(DISTDIR)/src/osx/iphone
$(CP_P) $(MACDIR)/iphone/*.mm $(DISTDIR)/src/osx/iphone
mkdir $(DISTDIR)/src/html/htmlctrl
mkdir $(DISTDIR)/src/html/htmlctrl/webkit
$(CP_P) $(WXDIR)/src/html/htmlctrl/webkit/*.mm $(DISTDIR)/src/html/htmlctrl/webkit
@@ -32129,13 +32137,6 @@ MACX_DIST: ALL_GUI_DIST
$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/osx/carbon
$(CP_P) $(MACDIR)/carbon/*.h $(DISTDIR)/src/osx/carbon
$(CP_P) $(MACDIR)/carbon/*.r $(DISTDIR)/src/osx/carbon
mkdir $(DISTDIR)/src/osx/carbon/morefile
$(CP_P) $(MACDIR)/carbon/morefile/*.h $(DISTDIR)/src/osx/carbon/morefile
$(CP_P) $(MACDIR)/carbon/morefile/*.c $(DISTDIR)/src/osx/carbon/morefile
mkdir $(DISTDIR)/src/osx/carbon/morefilex
$(CP_P) $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/osx/carbon/morefilex
$(CP_P) $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/osx/carbon/morefilex
$(CP_P) $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/osx/carbon/morefilex
COCOA_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/wx/cocoa/*.h $(DISTDIR)/include/wx/cocoa

19
build/bakefiles/make_dist.mk
View File

@@ -282,7 +282,6 @@ BASE_DIST: ALL_DIST INTL_DIST
mkdir $(DISTDIR)/src/osx
mkdir $(DISTDIR)/src/osx/core
mkdir $(DISTDIR)/src/osx/carbon
mkdir $(DISTDIR)/src/osx/carbon/morefilex
mkdir $(DISTDIR)/src/msdos
mkdir $(DISTDIR)/src/msw
mkdir $(DISTDIR)/src/os2
@@ -378,16 +377,25 @@ MOTIF_DIST: ALL_GUI_DIST
MACX_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
mkdir $(DISTDIR)/include/wx/osx/carbon
mkdir $(DISTDIR)/include/wx/osx/private
mkdir $(DISTDIR)/include/wx/osx/carbon/private
mkdir $(DISTDIR)/include/wx/osx/cocoa
mkdir $(DISTDIR)/include/wx/osx/iphone
$(CP_P) $(INCDIR)/wx/osx/*.h $(DISTDIR)/include/wx/osx
$(CP_P) $(INCDIR)/wx/osx/carbon/*.h $(DISTDIR)/include/wx/osx/carbon
$(CP_P) $(INCDIR)/wx/osx/carbon/private/*.h $(DISTDIR)/include/wx/osx/carbon/private
$(CP_P) $(INCDIR)/wx/osx/private/*.h $(DISTDIR)/include/wx/osx/private
$(CP_P) $(INCDIR)/wx/osx/cocoa/*.h $(DISTDIR)/include/wx/osx/cocoa
$(CP_P) $(INCDIR)/wx/osx/iphone/*.h $(DISTDIR)/include/wx/osx/iphone
mkdir $(DISTDIR)/include/wx/osx/core
mkdir $(DISTDIR)/include/wx/osx/core/private
$(CP_P) $(INCDIR)/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
$(CP_P) $(INCDIR)/wx/osx/core/private/*.h $(DISTDIR)/include/wx/osx/core/private
mkdir $(DISTDIR)/src/osx/core
$(CP_P) $(MACDIR)/core/*.cpp $(DISTDIR)/src/osx/core
mkdir $(DISTDIR)/src/osx/cocoa
$(CP_P) $(MACDIR)/cocoa/*.mm $(DISTDIR)/src/osx/cocoa
mkdir $(DISTDIR)/src/osx/iphone
$(CP_P) $(MACDIR)/iphone/*.mm $(DISTDIR)/src/osx/iphone
mkdir $(DISTDIR)/src/html/htmlctrl
mkdir $(DISTDIR)/src/html/htmlctrl/webkit
$(CP_P) $(WXDIR)/src/html/htmlctrl/webkit/*.mm $(DISTDIR)/src/html/htmlctrl/webkit
@@ -398,13 +406,6 @@ MACX_DIST: ALL_GUI_DIST
$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/osx/carbon
$(CP_P) $(MACDIR)/carbon/*.h $(DISTDIR)/src/osx/carbon
$(CP_P) $(MACDIR)/carbon/*.r $(DISTDIR)/src/osx/carbon
mkdir $(DISTDIR)/src/osx/carbon/morefile
$(CP_P) $(MACDIR)/carbon/morefile/*.h $(DISTDIR)/src/osx/carbon/morefile
$(CP_P) $(MACDIR)/carbon/morefile/*.c $(DISTDIR)/src/osx/carbon/morefile
mkdir $(DISTDIR)/src/osx/carbon/morefilex
$(CP_P) $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/osx/carbon/morefilex
$(CP_P) $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/osx/carbon/morefilex
$(CP_P) $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/osx/carbon/morefilex
COCOA_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/wx/cocoa/*.h $(DISTDIR)/include/wx/cocoa

8
configure.in
View File

@@ -6194,7 +6194,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
wxUSE_JOYSTICK=yes
dnl mac only available on darwin
elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
if test "$USE_DARWIN" = 1; then
dnl check for a bug in the headers, some have bad setEventCallout
AC_MSG_CHECKING([headers have declarations needed for joystick support])
@@ -7584,7 +7584,11 @@ AC_SUBST(UNICODE)
AC_SUBST(BUILD)
AC_SUBST(DEBUG_INFO)
AC_SUBST(DEBUG_FLAG)
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'`
if test "$TOOLKIT" = "MAC"; then
TOOLKIT_LOWERCASE=osx
else
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'`
fi
AC_SUBST(TOOLKIT_LOWERCASE)
AC_SUBST(TOOLKIT_VERSION)
AC_SUBST(SAMPLES_RPATH_FLAG)