Skip to content

Commit

Permalink
Merge pull request cocos2d#954 from minggo/gles20
Browse files Browse the repository at this point in the history 
add CCBReader into project
  • Loading branch information
@minggo
minggo committed Jun 1, 2012
2 parents 355e735 + a7a34ee commit 9cfa6cb
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 4 deletions.
20 changes: 20 additions & 0 deletions HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj
View file
Expand Up @@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
15DD6D82156DD1EF003E7567 /* fps_images.fnt in Resources */ = {isa = PBXBuildFile; fileRef = 15DD6D80156DD1EF003E7567 /* fps_images.fnt */; };
15DD6D83156DD1EF003E7567 /* fps_images.png in Resources */ = {isa = PBXBuildFile; fileRef = 15DD6D81156DD1EF003E7567 /* fps_images.png */; };
15EFF2C815786787002D8F37 /* CCBCustomClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFF2C315786787002D8F37 /* CCBCustomClass.cpp */; };
15EFF2CA15786787002D8F37 /* CCBReader_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFF2C715786787002D8F37 /* CCBReader_v2.cpp */; };
506EDB88102F4C4000A389B3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 506EDB87102F4C4000A389B3 /* libz.dylib */; };
506EDBA5102F4C9F00A389B3 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 506EDBA4102F4C9F00A389B3 /* AVFoundation.framework */; };
78947C6D14EBB9B100DBD5A6 /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 78947C5E14EBB9B000DBD5A6 /* background.mp3 */; };
Expand Down Expand Up @@ -226,6 +228,10 @@
158F25951574BD920092E383 /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = "<group>"; };
15DD6D80156DD1EF003E7567 /* fps_images.fnt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fps_images.fnt; sourceTree = "<group>"; };
15DD6D81156DD1EF003E7567 /* fps_images.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fps_images.png; sourceTree = "<group>"; };
15EFF2C315786787002D8F37 /* CCBCustomClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBCustomClass.cpp; sourceTree = "<group>"; };
15EFF2C415786787002D8F37 /* CCBCustomClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBCustomClass.h; sourceTree = "<group>"; };
15EFF2C515786787002D8F37 /* CCBReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBReader.h; sourceTree = "<group>"; };
15EFF2C715786787002D8F37 /* CCBReader_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBReader_v2.cpp; sourceTree = "<group>"; };
1D6058910D05DD3D006BFB54 /* HelloLua.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloLua.app; sourceTree = BUILT_PRODUCTS_DIR; };
506EDB87102F4C4000A389B3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
506EDBA4102F4C9F00A389B3 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -680,6 +686,17 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
15EFF2C215786787002D8F37 /* CCBReader */ = {
isa = PBXGroup;
children = (
15EFF2C315786787002D8F37 /* CCBCustomClass.cpp */,
15EFF2C415786787002D8F37 /* CCBCustomClass.h */,
15EFF2C515786787002D8F37 /* CCBReader.h */,
15EFF2C715786787002D8F37 /* CCBReader_v2.cpp */,
);
path = CCBReader;
sourceTree = "<group>";
};
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -866,6 +883,7 @@
78DC4AF915490AF300317402 /* extensions */ = {
isa = PBXGroup;
children = (
15EFF2C215786787002D8F37 /* CCBReader */,
78DC4AFA15490AF300317402 /* CCControlExtension */,
78EE00D41550D16B004C84B0 /* CCListView */,
78DC4B1415490AF300317402 /* CCNotificationCenter */,
Expand Down Expand Up @@ -1795,6 +1813,8 @@
78EE00DD1550D16B004C84B0 /* CCListView.cpp in Sources */,
78EE00DE1550D16B004C84B0 /* CCListViewCell.cpp in Sources */,
78EE00DF1550D16B004C84B0 /* CCTextureWatcher.cpp in Sources */,
15EFF2C815786787002D8F37 /* CCBCustomClass.cpp in Sources */,
15EFF2CA15786787002D8F37 /* CCBReader_v2.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
20 changes: 20 additions & 0 deletions HelloWorld/proj.ios/HelloWorld.xcodeproj/project.pbxproj
View file
Expand Up @@ -9,6 +9,8 @@
/* Begin PBXBuildFile section */
15DD6D79156DD120003E7567 /* fps_images.fnt in Resources */ = {isa = PBXBuildFile; fileRef = 15DD6D77156DD120003E7567 /* fps_images.fnt */; };
15DD6D7A156DD120003E7567 /* fps_images.png in Resources */ = {isa = PBXBuildFile; fileRef = 15DD6D78156DD120003E7567 /* fps_images.png */; };
15EFF2BA15786755002D8F37 /* CCBCustomClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFF2B515786755002D8F37 /* CCBCustomClass.cpp */; };
15EFF2BC15786755002D8F37 /* CCBReader_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15EFF2B915786755002D8F37 /* CCBReader_v2.cpp */; };
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
Expand Down Expand Up @@ -172,6 +174,10 @@
158F258F1574BD400092E383 /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCStdC.h; path = ../../cocos2dx/platform/ios/CCStdC.h; sourceTree = "<group>"; };
15DD6D77156DD120003E7567 /* fps_images.fnt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fps_images.fnt; sourceTree = "<group>"; };
15DD6D78156DD120003E7567 /* fps_images.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fps_images.png; sourceTree = "<group>"; };
15EFF2B515786755002D8F37 /* CCBCustomClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBCustomClass.cpp; sourceTree = "<group>"; };
15EFF2B615786755002D8F37 /* CCBCustomClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBCustomClass.h; sourceTree = "<group>"; };
15EFF2B715786755002D8F37 /* CCBReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBReader.h; sourceTree = "<group>"; };
15EFF2B915786755002D8F37 /* CCBReader_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBReader_v2.cpp; sourceTree = "<group>"; };
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D6058910D05DD3D006BFB54 /* HelloWorld.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloWorld.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -534,6 +540,17 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
15EFF2B415786755002D8F37 /* CCBReader */ = {
isa = PBXGroup;
children = (
15EFF2B515786755002D8F37 /* CCBCustomClass.cpp */,
15EFF2B615786755002D8F37 /* CCBCustomClass.h */,
15EFF2B715786755002D8F37 /* CCBReader.h */,
15EFF2B915786755002D8F37 /* CCBReader_v2.cpp */,
);
path = CCBReader;
sourceTree = "<group>";
};
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -702,6 +719,7 @@
781C35B31547F0ED00633F88 /* extensions */ = {
isa = PBXGroup;
children = (
15EFF2B415786755002D8F37 /* CCBReader */,
781C35B41547F0ED00633F88 /* CCControlExtension */,
78EE00F61550D1C7004C84B0 /* CCListView */,
781C35CE1547F0ED00633F88 /* CCNotificationCenter */,
Expand Down Expand Up @@ -1466,6 +1484,8 @@
78EE00FF1550D1C7004C84B0 /* CCListView.cpp in Sources */,
78EE01001550D1C7004C84B0 /* CCListViewCell.cpp in Sources */,
78EE01011550D1C7004C84B0 /* CCTextureWatcher.cpp in Sources */,
15EFF2BA15786755002D8F37 /* CCBCustomClass.cpp in Sources */,
15EFF2BC15786755002D8F37 /* CCBReader_v2.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
4 changes: 0 additions & 4 deletions testjs/proj.ios/testjs.xcodeproj/project.pbxproj
View file
Expand Up @@ -153,7 +153,6 @@
D4544FD6156E03D200887EB5 /* CCBCustomClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4544CB3156E03D000887EB5 /* CCBCustomClass.cpp */; };
D4544FD7156E03D200887EB5 /* CCBCustomClass.h in Headers */ = {isa = PBXBuildFile; fileRef = D4544CB4156E03D000887EB5 /* CCBCustomClass.h */; };
D4544FD8156E03D200887EB5 /* CCBReader.h in Headers */ = {isa = PBXBuildFile; fileRef = D4544CB5156E03D000887EB5 /* CCBReader.h */; };
D4544FD9156E03D200887EB5 /* CCBReader_v1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4544CB6156E03D000887EB5 /* CCBReader_v1.cpp */; };
D4544FDA156E03D200887EB5 /* CCBReader_v2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4544CB7156E03D000887EB5 /* CCBReader_v2.cpp */; };
D4544FDB156E03D200887EB5 /* CCControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4544CB9156E03D000887EB5 /* CCControl.cpp */; };
D4544FDC156E03D200887EB5 /* CCControl.h in Headers */ = {isa = PBXBuildFile; fileRef = D4544CBA156E03D000887EB5 /* CCControl.h */; };
Expand Down Expand Up @@ -584,7 +583,6 @@
D4544CB3156E03D000887EB5 /* CCBCustomClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBCustomClass.cpp; sourceTree = "<group>"; };
D4544CB4156E03D000887EB5 /* CCBCustomClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBCustomClass.h; sourceTree = "<group>"; };
D4544CB5156E03D000887EB5 /* CCBReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBReader.h; sourceTree = "<group>"; };
D4544CB6156E03D000887EB5 /* CCBReader_v1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBReader_v1.cpp; sourceTree = "<group>"; };
D4544CB7156E03D000887EB5 /* CCBReader_v2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBReader_v2.cpp; sourceTree = "<group>"; };
D4544CB9156E03D000887EB5 /* CCControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCControl.cpp; sourceTree = "<group>"; };
D4544CBA156E03D000887EB5 /* CCControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCControl.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1192,7 +1190,6 @@
D4544CB3156E03D000887EB5 /* CCBCustomClass.cpp */,
D4544CB4156E03D000887EB5 /* CCBCustomClass.h */,
D4544CB5156E03D000887EB5 /* CCBReader.h */,
D4544CB6156E03D000887EB5 /* CCBReader_v1.cpp */,
D4544CB7156E03D000887EB5 /* CCBReader_v2.cpp */,
);
path = CCBReader;
Expand Down Expand Up @@ -2149,7 +2146,6 @@
D4544FD2156E03D200887EB5 /* CCGrabber.cpp in Sources */,
D4544FD4156E03D200887EB5 /* CCGrid.cpp in Sources */,
D4544FD6156E03D200887EB5 /* CCBCustomClass.cpp in Sources */,
D4544FD9156E03D200887EB5 /* CCBReader_v1.cpp in Sources */,
D4544FDA156E03D200887EB5 /* CCBReader_v2.cpp in Sources */,
D4544FDB156E03D200887EB5 /* CCControl.cpp in Sources */,
D4544FDD156E03D200887EB5 /* CCControlButton.cpp in Sources */,
Expand Down

0 comments on commit 9cfa6cb

Please sign in to comment.