X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8691eeba23b7e494564a183bf19b09cfe47caa01..f9a2692dbe8db32938121899073abef4d07dee13:/src/wxWindows.pbproj/project.pbxproj

diff --git a/src/wxWindows.pbproj/project.pbxproj b/src/wxWindows.pbproj/project.pbxproj
index 162e05d7f2..0c63987082 100644
--- a/src/wxWindows.pbproj/project.pbxproj
+++ b/src/wxWindows.pbproj/project.pbxproj
@@ -379,8 +379,8 @@
 			);
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 2.5;
-				DYLIB_CURRENT_VERSION = 2.5.0;
-				HEADER_SEARCH_PATHS = "\"${DERIVED_SOURCES_DIR}/include\" ../include mac/morefilex jpeg png regex tiff - \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" /usr/include";
+				DYLIB_CURRENT_VERSION = 2.5.3;
+				HEADER_SEARCH_PATHS = "\"${SYMROOT}/include\" ../include mac/carbon/morefilex jpeg png regex tiff - \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" /usr/include";
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.1;
 				LIBRARY_STYLE = DYNAMIC;
 				OPTIMIZATION_CFLAGS = "-O0";
@@ -412,7 +412,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Create wx include directory if necessary\nif [ ! -d \"${DERIVED_SOURCES_DIR}/include/wx\" ]; then\n    mkdir -p \"${DERIVED_SOURCES_DIR}/include/wx\" || exit 1\nfi\n# Copy setup0.h to setup.h\ncp \"$SRCROOT/../include/wx/mac/setup0.h\" \"${DERIVED_SOURCES_DIR}/include/wx/setup.h\" || exit 1\n# Generate lexer\nif [ ! -f \"$SYMROOT/lexer.c\" -o \"$SYMROOT/lexer.c\" -ot \"$SRCROOT/common/lexer.l\" ]; then\n    flex \"$SRCROOT/common/lexer.l\" || exit 1\n    sed -e \"s;$SRCROOT/common/lex.yy.c;lexer.l;g\" < lex.yy.c | \\\n    sed -e \"s/yy/PROIO_yy/g\"            | \\\n    sed -e \"s/input/PROIO_input/g\"      | \\\n    sed -e \"s/unput/PROIO_unput/g\"      > \"$SYMROOT/lexer.c\" || exit 1\n    rm -f lex.yy.c\nfi\n# Generate parser\nif [ ! -f \"$SYMROOT/parser.c\" -o \"$SYMROOT/parser.c\" -ot \"$SRCROOT/common/parser.y\" ]; then\n    bison -y \"$SRCROOT/common/parser.y\" || exit 1\n    sed -e \"s;$SRCROOT/common/y.tab.c;parser.y;g\" < y.tab.c | \\\n    sed -e \"s/BUFSIZ/5000/g\"            | \\\n    sed -e \"s/YYLMAX 200/YYLMAX 5000/g\" | \\\n    sed -e \"s/yy/PROIO_yy/g\"            | \\\n    sed -e \"s/input/PROIO_input/g\"      | \\\n    sed -e \"s/unput/PROIO_unput/g\"      > \"$SYMROOT/parser.c\" || exit 1\n    rm -f y.tab.c\nfi";
+			shellScript = "$SRCROOT/../distrib/mac/pbsetup-sh \"${SRCROOT}\" \"${SYMROOT}\"";
 		};
 		CA89560204D6EE8C00000080 = {
 			buildActionMask = 2147483647;
@@ -3172,8 +3172,8 @@
 			buildSettings = {
 				DEBUGGING_SYMBOLS = NO;
 				DYLIB_COMPATIBILITY_VERSION = 2.5;
-				DYLIB_CURRENT_VERSION = 2.5.0;
-				HEADER_SEARCH_PATHS = "\"${DERIVED_SOURCES_DIR}/include\" ../include mac/morefile jpeg png regex tiff - \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" /usr/include";
+				DYLIB_CURRENT_VERSION = 2.5.3;
+				HEADER_SEARCH_PATHS = "\"${SYMROOT}/include\" ../include mac/carbon/morefile jpeg png regex tiff - \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" /usr/include";
 				LIBRARY_STYLE = DYNAMIC;
 				OPTIMIZATION_CFLAGS = "-O3";
 				OTHER_CFLAGS = "-DNO_GCC_PRAGMA -DWXMAKINGDLL -D__WXMAC__ -DwxUSE_BASE=1 -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES";
@@ -3205,7 +3205,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Create wx include directory if necessary\nif [ ! -d \"${DERIVED_SOURCES_DIR}/include/wx\" ]; then\n    mkdir -p \"${DERIVED_SOURCES_DIR}/include/wx\" || exit 1\nfi\n# Copy setup0.h to setup.h\ncp \"$SRCROOT/../include/wx/mac/setup0.h\" \"${DERIVED_SOURCES_DIR}/include/wx/setup.h\" || exit 1\n# Generate lexer\nif [ ! -f \"$SYMROOT/lexer.c\" -o \"$SYMROOT/lexer.c\" -ot \"$SRCROOT/common/lexer.l\" ]; then\n    flex \"$SRCROOT/common/lexer.l\" || exit 1\n    sed -e \"s;$SRCROOT/common/lex.yy.c;lexer.l;g\" < lex.yy.c | \\\n    sed -e \"s/yy/PROIO_yy/g\"            | \\\n    sed -e \"s/input/PROIO_input/g\"      | \\\n    sed -e \"s/unput/PROIO_unput/g\"      > \"$SYMROOT/lexer.c\" || exit 1\n    rm -f lex.yy.c\nfi\n# Generate parser\nif [ ! -f \"$SYMROOT/parser.c\" -o \"$SYMROOT/parser.c\" -ot \"$SRCROOT/common/parser.y\" ]; then\n    bison -y \"$SRCROOT/common/parser.y\" || exit 1\n    sed -e \"s;$SRCROOT/common/y.tab.c;parser.y;g\" < y.tab.c | \\\n    sed -e \"s/BUFSIZ/5000/g\"            | \\\n    sed -e \"s/YYLMAX 200/YYLMAX 5000/g\" | \\\n    sed -e \"s/yy/PROIO_yy/g\"            | \\\n    sed -e \"s/input/PROIO_input/g\"      | \\\n    sed -e \"s/unput/PROIO_unput/g\"      > \"$SYMROOT/parser.c\" || exit 1\n    rm -f y.tab.c\nfi";
+			shellScript = "$SRCROOT/../distrib/mac/pbsetup-sh \"${SRCROOT}\" \"${SYMROOT}\"";
 		};
 		CA8957A704D707E000000080 = {
 			buildActionMask = 2147483647;
@@ -6043,7 +6043,7 @@
 			);
 			isa = PBXGroup;
 			name = morefilex;
-			path = mac/morefilex;
+			path = mac/carbon/morefilex;
 			refType = 2;
 		};
 		CADEF54303C8C0A800000133 = {
@@ -6136,7 +6136,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Create wx include directory if necessary\nif [ ! -d \"${DERIVED_SOURCES_DIR}/include/wx\" ]; then\n    mkdir -p \"${DERIVED_SOURCES_DIR}/include/wx\" || exit 1\nfi\n# Copy setup0.h to setup.h\ncp \"$SRCROOT/../include/wx/mac/setup0.h\" \"${DERIVED_SOURCES_DIR}/include/wx/setup.h\" || exit 1\n# Generate lexer\nif [ ! -f \"$SYMROOT/lexer.c\" -o \"$SYMROOT/lexer.c\" -ot \"$SRCROOT/common/lexer.l\" ]; then\n    flex \"$SRCROOT/common/lexer.l\" || exit 1\n    sed -e \"s;$SRCROOT/common/lex.yy.c;lexer.l;g\" < lex.yy.c | \\\n    sed -e \"s/yy/PROIO_yy/g\"            | \\\n    sed -e \"s/input/PROIO_input/g\"      | \\\n    sed -e \"s/unput/PROIO_unput/g\"      > \"$SYMROOT/lexer.c\" || exit 1\n    rm -f lex.yy.c\nfi\n# Generate parser\nif [ ! -f \"$SYMROOT/parser.c\" -o \"$SYMROOT/parser.c\" -ot \"$SRCROOT/common/parser.y\" ]; then\n    bison -y \"$SRCROOT/common/parser.y\" || exit 1\n    sed -e \"s;$SRCROOT/common/y.tab.c;parser.y;g\" < y.tab.c | \\\n    sed -e \"s/BUFSIZ/5000/g\"            | \\\n    sed -e \"s/YYLMAX 200/YYLMAX 5000/g\" | \\\n    sed -e \"s/yy/PROIO_yy/g\"            | \\\n    sed -e \"s/input/PROIO_input/g\"      | \\\n    sed -e \"s/unput/PROIO_unput/g\"      > \"$SYMROOT/parser.c\" || exit 1\n    rm -f y.tab.c\nfi";
+			shellScript = "$SRCROOT/../distrib/mac/pbsetup-sh \"${SRCROOT}\" \"${SYMROOT}\"";
 		};
 		F5955E9D02CBA8B501000133 = {
 			fileRef = F5A8619E01FA022C0175ACA7;
@@ -11839,7 +11839,7 @@
 				F5A85D8D01FA022B0175ACA7,
 			);
 			isa = PBXGroup;
-			path = mac;
+			path = mac/carbon;
 			refType = 4;
 		};
 		F5A85D3C01FA022B0175ACA7 = {
@@ -13798,6 +13798,13 @@
 			path = common/statbar.cpp;
 			refType = 2;
 		};
+		F5A8604C01FA022C0175ACA7 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			name = stockitem.cpp;
+			path = common/stockitem.cpp;
+			refType = 2;
+		};
 		F5A8604D01FA022C0175ACA7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -14790,7 +14797,7 @@
 				F5A8620A01FA022C0175ACA7,
 			);
 			isa = PBXGroup;
-			path = mac;
+			path = mac/carbon;
 			refType = 4;
 		};
 		F5A8619A01FA022C0175ACA7 = {
@@ -15021,6 +15028,12 @@
 			path = gdiobj.cpp;
 			refType = 4;
 		};
+		F5A861C101FA022C0175ACA7 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = hid.cpp;
+			refType = 4;
+		};
 		F5A861C301FA022C0175ACA7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -15277,6 +15290,12 @@
 			path = tabctrl.cpp;
 			refType = 4;
 		};
+		F5A861FD01FA022C0175ACA7 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = taskbar.cpp;
+			refType = 4;
+		};
 		F5A861FF01FA022C0175ACA7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -15792,8 +15811,8 @@
 			);
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 2.5;
-				DYLIB_CURRENT_VERSION = 2.5.0;
-				HEADER_SEARCH_PATHS = "\"${DERIVED_SOURCES_DIR}/include\" ../include mac/morefilex jpeg png regex tiff - \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" /usr/include";
+				DYLIB_CURRENT_VERSION = 2.5.3;
+				HEADER_SEARCH_PATHS = "\"${SYMROOT}/include\" ../include mac/carbon/morefilex jpeg png regex tiff - \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" /usr/include";
 				LIBRARY_STYLE = STATIC;
 				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "-DNO_GCC_PRAGMA -D__WXDEBUG__ -D__WXMAC__ -DwxUSE_BASE=1 -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES";
@@ -16235,7 +16254,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Create wx include directory if necessary\nif [ ! -d \"${DERIVED_SOURCES_DIR}/include/wx\" ]; then\n    mkdir -p \"${DERIVED_SOURCES_DIR}/include/wx\" || exit 1\nfi\n# Copy setup0.h to setup.h\ncp \"$SRCROOT/../include/wx/mac/setup0.h\" \"${DERIVED_SOURCES_DIR}/include/wx/setup.h\" || exit 1\n# Generate lexer\nif [ ! -f \"$SYMROOT/lexer.c\" -o \"$SYMROOT/lexer.c\" -ot \"$SRCROOT/common/lexer.l\" ]; then\n    flex \"$SRCROOT/common/lexer.l\" || exit 1\n    sed -e \"s;$SRCROOT/common/lex.yy.c;lexer.l;g\" < lex.yy.c | \\\n    sed -e \"s/yy/PROIO_yy/g\"            | \\\n    sed -e \"s/input/PROIO_input/g\"      | \\\n    sed -e \"s/unput/PROIO_unput/g\"      > \"$SYMROOT/lexer.c\" || exit 1\n    rm -f lex.yy.c\nfi\n# Generate parser\nif [ ! -f \"$SYMROOT/parser.c\" -o \"$SYMROOT/parser.c\" -ot \"$SRCROOT/common/parser.y\" ]; then\n    bison -y \"$SRCROOT/common/parser.y\" || exit 1\n    sed -e \"s;$SRCROOT/common/y.tab.c;parser.y;g\" < y.tab.c | \\\n    sed -e \"s/BUFSIZ/5000/g\"            | \\\n    sed -e \"s/YYLMAX 200/YYLMAX 5000/g\" | \\\n    sed -e \"s/yy/PROIO_yy/g\"            | \\\n    sed -e \"s/input/PROIO_input/g\"      | \\\n    sed -e \"s/unput/PROIO_unput/g\"      > \"$SYMROOT/parser.c\" || exit 1\n    rm -f y.tab.c\nfi";
+			shellScript = "$SRCROOT/../distrib/mac/pbsetup-sh \"${SRCROOT}\" \"${SYMROOT}\"";
 		};
 		F5CC83D90379C17C01000133 = {
 			fileEncoding = 30;
@@ -16841,8 +16860,8 @@
 			buildSettings = {
 				DEBUGGING_SYMBOLS = NO;
 				DYLIB_COMPATIBILITY_VERSION = 2.5;
-				DYLIB_CURRENT_VERSION = 2.5.0;
-				HEADER_SEARCH_PATHS = "\"${DERIVED_SOURCES_DIR}/include\" ../include mac/morefile jpeg png regex tiff - \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" /usr/include";
+				DYLIB_CURRENT_VERSION = 2.5.3;
+				HEADER_SEARCH_PATHS = "\"${SYMROOT}/include\" ../include mac/carbon/morefile jpeg png regex tiff - \"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" /usr/include";
 				LIBRARY_STYLE = STATIC;
 				OPTIMIZATION_CFLAGS = "-O3";
 				OTHER_CFLAGS = "-DNO_GCC_PRAGMA -D__WXMAC__ -DwxUSE_BASE=1 -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES";