Skip to content

Commit

Permalink
fixed cocos2d#410, recheck the search header paths & libraries paths …
Browse files Browse the repository at this point in the history 
…in xcode3 templates
  • Loading branch information
walzer committed Mar 21, 2011
1 parent 71961f6 commit fb96c6a
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 61 deletions.
2 changes: 1 addition & 1 deletion install-templates-xcode3.sh
View file
Expand Up @@ -2,7 +2,7 @@

echo 'cocos2d-x template installer'

COCOS2D_VER='cocos2d-0.99.5-x-0.8.0'
COCOS2D_VER='cocos2d-0.99.5-x-0.8.1'
BASE_TEMPLATE_DIR="/Library/Application Support/Developer/Shared/Xcode"
BASE_TEMPLATE_USER_DIR="$HOME/Library/Application Support/Developer/Shared/Xcode"

Expand Down
32 changes: 14 additions & 18 deletions template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
View file
Expand Up @@ -1520,9 +1520,12 @@
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = 4.2;
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
HEADER_SEARCH_PATHS = libs/cocos2dx;
HEADER_SEARCH_PATHS = (
libs/cocos2dx,
libs/CocosDenshion/include,
);
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 3.0;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-ObjC",
Expand Down Expand Up @@ -1559,11 +1562,10 @@
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
HEADER_SEARCH_PATHS = (
libs/cocos2dx,
libs/cocos2dx/platform/iphone/third_party/libxml2,
libs/cocos2dx/platform/iphone/third_party/opengles,
libs/CocosDenshion/include,
);
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 3.0;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"-ObjC",
Expand Down Expand Up @@ -1593,13 +1595,10 @@
HEADER_SEARCH_PATHS = (
"$(SDKROOT)/usr/include/libxml2",
libs/cocos2dx,
libs/cocos2dx/platform,
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/android/libraries\"",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/win32/libraries\"",
libs/CocosDenshion/include,
);
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
PREBINDING = NO;
PRODUCT_NAME = "cocos2d libraries";
SDKROOT = iphoneos;
Expand All @@ -1619,15 +1618,12 @@
);
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = (
libs/cocos2dx/platform/iphone/third_party/opengles,
"$(SDKROOT)/usr/include/libxml2",
libs/cocos2dx,
libs/cocos2dx/platform/iphone/third_party/libxml2,
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/android/libraries\"",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/win32/libraries\"",
libs/CocosDenshion/include,
);
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
PREBINDING = NO;
PRODUCT_NAME = "cocos2d libraries";
SDKROOT = iphoneos;
Expand Down
28 changes: 11 additions & 17 deletions template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
View file
Expand Up @@ -1857,13 +1857,13 @@
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = 4.2;
HEADER_SEARCH_PATHS = (
libs/cocos2dx/platform,
"$(SDKROOT)/usr/include/libxml2",
libs/cocos2dx,
libs/Box2D,
ilbs/CocosDenshion/include,
libs,
);
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_LDFLAGS = (
"-all_load",
"-ObjC",
Expand Down Expand Up @@ -1891,13 +1891,13 @@
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = 4.2;
HEADER_SEARCH_PATHS = (
libs/cocos2dx/platform/iphone/third_party/opengles,
libs/cocos2dx/platform/iphone/third_party/libxml2,
libs/cocos2dx,
libs/Box2D,
ilbs/CocosDenshion/include,
libs,
);
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_LDFLAGS = (
"-all_load",
"-ObjC",
Expand All @@ -1923,15 +1923,12 @@
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = (
libs/cocos2dx,
libs/CocosDenshion/include,
libs,
"$(SDKROOT)/usr/include/libxml2",
libs/cocos2dx/platform,
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/android/libraries\"",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/win32/libraries\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
PREBINDING = NO;
PRODUCT_NAME = "cocos2d libraries";
SDKROOT = iphoneos;
Expand All @@ -1952,15 +1949,12 @@
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = (
libs/cocos2dx,
libs/CocosDenshion/include,
libs,
libs/cocos2dx/platform/iphone/third_party/libxml2,
libs/cocos2dx/platform/iphone/third_party/opengles,
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/android/libraries\"",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/win32/libraries\"",
"$(SDKROOT)/usr/include/libxml2",
);
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = "-fvisibility=hidden";
PREBINDING = NO;
PRODUCT_NAME = "cocos2d libraries";
Expand Down
42 changes: 19 additions & 23 deletions template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
View file
Expand Up @@ -1765,20 +1765,21 @@
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = 4.2;
HEADER_SEARCH_PATHS = (
libs/chipmunk,
libs/cocos2dx,
"$(SDKROOT)/usr/include/libxml2",
libs/cocos2dx/platform,
libs,
libs/chipmunk/include/chipmunk,
libs/chipmunk/include/constraints,
libs/CocosDenshion/include,
);
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_LDFLAGS = (
"-all_load",
"-ObjC",
);
PREBINDING = NO;
PRODUCT_NAME = "___PROJECTNAME___";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
WARNING_CFLAGS = "";
};
name = Debug;
Expand All @@ -1801,20 +1802,21 @@
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = 4.2;
HEADER_SEARCH_PATHS = (
libs/chipmunk,
libs/cocos2dx,
libs/cocos2dx/platform/iphone/third_party/libxml2,
libs/cocos2dx/platform/iphone/third_party/opengles,
libs,
libs/chipmunk/include/chipmunk,
libs/chipmunk/include/constraints,
libs/CocosDenshion/include,
);
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_LDFLAGS = (
"-all_load",
"-ObjC",
);
PREBINDING = NO;
PRODUCT_NAME = "___PROJECTNAME___";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
WARNING_CFLAGS = "";
};
name = Release;
Expand All @@ -1832,17 +1834,14 @@
);
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = (
libs/cocos2dx,
libs/Chipmunk/include/chipmunk,
libs/CocosDenshion/include,
libs,
libs/cocos2dx,
libs/cocos2dx/platform,
"$(SDKROOT)/usr/include/libxml2",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/android/libraries\"",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/win32/libraries\"",
);
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
PREBINDING = NO;
PRODUCT_NAME = "cocos2d libraries";
SDKROOT = iphoneos;
Expand All @@ -1862,17 +1861,14 @@
);
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
HEADER_SEARCH_PATHS = (
libs/cocos2dx,
libs/Chipmunk/include/chipmunk,
libs/CocosDenshion/include,
libs,
libs/cocos2dx,
libs/cocos2dx/platform/iphone/third_party/opengles,
libs/cocos2dx/platform/iphone/third_party/libxml2,
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/android/libraries\"",
"\"$(SRCROOT)/libs/cocos2dx/platform/third_party/win32/libraries\"",
"$(SDKROOT)/usr/include/libxml2",
);
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_CFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = "cocos2d libraries";
Expand Down
2 changes: 0 additions & 2 deletions tests/test.ios/test.xcodeproj/project.pbxproj
View file
Expand Up @@ -4467,7 +4467,6 @@
"\"$(SRCROOT)/../..\"",
"\"$(SRCROOT)/../../cocos2dx\"",
"\"$(SRCROOT)/../../cocos2dx/include\"",
"\"$(SDKROOT)/usr/include/libxml2\"",
);
INFOPLIST_FILE = "Test-Info.plist";
LIBRARY_SEARCH_PATHS = (
Expand Down Expand Up @@ -4503,7 +4502,6 @@
"\"$(SRCROOT)/../..\"",
"\"$(SRCROOT)/../../cocos2dx\"",
"\"$(SRCROOT)/../../cocos2dx/include\"",
"\"$(SDKROOT)/usr/include/libxml2\"",
);
INFOPLIST_FILE = "Test-Info.plist";
LIBRARY_SEARCH_PATHS = (
Expand Down

0 comments on commit fb96c6a

Please sign in to comment.