Skip to content

Commit 8bf075e

Browse files
committed
Ensuring that the android test project compiles (just added android target for a new effect).
1 parent f1b2006 commit 8bf075e

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

cocos2d-ios.xcodeproj/project.pbxproj

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@
281281
D28A2E1B1954F68D00ADC03D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D28A2E1A1954F68D00ADC03D /* QuartzCore.framework */; };
282282
D28A2E1D1954F7E000ADC03D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D28A2E1C1954F7E000ADC03D /* OpenGLES.framework */; };
283283
D28A2E211954F85700ADC03D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D28A2E201954F85700ADC03D /* AVFoundation.framework */; };
284+
D28B2E7A19CBA89A00DC6E08 /* CCEffectColorChannelOffset.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DBCA31319B68BE400EFE96D /* CCEffectColorChannelOffset.m */; };
284285
D291DCC2195B2FA100278EC0 /* libObjectiveChipmunk-iPhone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B759E52D1880C66900E8166C /* libObjectiveChipmunk-iPhone.a */; };
285286
D299CE7A19C2910B00519CBB /* CCEffectDFInnerGlow.h in Headers */ = {isa = PBXBuildFile; fileRef = D299CE7819C2910B00519CBB /* CCEffectDFInnerGlow.h */; };
286287
D299CE7B19C2910B00519CBB /* CCEffectDFInnerGlow.h in Headers */ = {isa = PBXBuildFile; fileRef = D299CE7819C2910B00519CBB /* CCEffectDFInnerGlow.h */; };
@@ -309,7 +310,6 @@
309310
D2DDB0A719805E8400233D80 /* CCMatrix3.m in Sources */ = {isa = PBXBuildFile; fileRef = D2DDB09219805E8400233D80 /* CCMatrix3.m */; };
310311
D2DDB0A819805E8400233D80 /* CCMatrix3.m in Sources */ = {isa = PBXBuildFile; fileRef = D2DDB09219805E8400233D80 /* CCMatrix3.m */; };
311312
D2EC6039199D9F82001A15E9 /* CCRendererGLSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = D36DFA2719996EC500DEC135 /* CCRendererGLSupport.m */; };
312-
D2F78CC81999AB6E00229357 /* CCEffectDropShadow.h in Headers */ = {isa = PBXBuildFile; fileRef = D2F78CC71999AB6E00229357 /* CCEffectDropShadow.h */; };
313313
D2FEB611194F6C9E00FC0574 /* CCBLocalizationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = B7D273041822F4AA0054849B /* CCBLocalizationManager.h */; };
314314
D2FEB612194F6C9E00FC0574 /* CCAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2520DFDEAFF00C013A5 /* CCAction.h */; };
315315
D2FEB613194F6C9E00FC0574 /* CCNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 5018F2540DFDEAFF00C013A5 /* CCNode.h */; };
@@ -599,6 +599,13 @@
599599
remoteGlobalIDString = D309B21217EFE2EF00AA52C8;
600600
remoteInfo = "ObjectiveChipmunk-iPhone";
601601
};
602+
D28B2E7D19CBA89A00DC6E08 /* PBXContainerItemProxy */ = {
603+
isa = PBXContainerItemProxy;
604+
containerPortal = FC39961319C3B92F00C93E5E /* ObjectAL.xcodeproj */;
605+
proxyType = 2;
606+
remoteGlobalIDString = D369B53219C8E73C00BA46EA;
607+
remoteInfo = "ObjectAL (Mac)";
608+
};
602609
D2FEB60F194F6C9E00FC0574 /* PBXContainerItemProxy */ = {
603610
isa = PBXContainerItemProxy;
604611
containerPortal = B759E5281880C66900E8166C /* Chipmunk7-ios.xcodeproj */;
@@ -613,13 +620,6 @@
613620
remoteGlobalIDString = CBBAB312171D0B84009B955F;
614621
remoteInfo = "ObjectAL (iOS)";
615622
};
616-
FC39961C19C3B92F00C93E5E /* PBXContainerItemProxy */ = {
617-
isa = PBXContainerItemProxy;
618-
containerPortal = FC39961319C3B92F00C93E5E /* ObjectAL.xcodeproj */;
619-
proxyType = 2;
620-
remoteGlobalIDString = CBBAB33D171D0BC4009B955F;
621-
remoteInfo = "ObjectAL (OSX)";
622-
};
623623
FC39961E19C3B92F00C93E5E /* PBXContainerItemProxy */ = {
624624
isa = PBXContainerItemProxy;
625625
containerPortal = FC39961319C3B92F00C93E5E /* ObjectAL.xcodeproj */;
@@ -1707,8 +1707,8 @@
17071707
isa = PBXGroup;
17081708
children = (
17091709
FC39961B19C3B92F00C93E5E /* libObjectAL.a */,
1710-
FC39961D19C3B92F00C93E5E /* ObjectAL.framework */,
17111710
FC39961F19C3B92F00C93E5E /* libObjectAL (Android).a */,
1711+
D28B2E7E19CBA89A00DC6E08 /* libObjectAL (Mac).a */,
17121712
);
17131713
name = Products;
17141714
sourceTree = "<group>";
@@ -2131,18 +2131,18 @@
21312131
remoteRef = B759E52C1880C66900E8166C /* PBXContainerItemProxy */;
21322132
sourceTree = BUILT_PRODUCTS_DIR;
21332133
};
2134-
FC39961B19C3B92F00C93E5E /* libObjectAL.a */ = {
2134+
D28B2E7E19CBA89A00DC6E08 /* libObjectAL (Mac).a */ = {
21352135
isa = PBXReferenceProxy;
21362136
fileType = archive.ar;
2137-
path = libObjectAL.a;
2138-
remoteRef = FC39961A19C3B92F00C93E5E /* PBXContainerItemProxy */;
2137+
path = "libObjectAL (Mac).a";
2138+
remoteRef = D28B2E7D19CBA89A00DC6E08 /* PBXContainerItemProxy */;
21392139
sourceTree = BUILT_PRODUCTS_DIR;
21402140
};
2141-
FC39961D19C3B92F00C93E5E /* ObjectAL.framework */ = {
2141+
FC39961B19C3B92F00C93E5E /* libObjectAL.a */ = {
21422142
isa = PBXReferenceProxy;
2143-
fileType = wrapper.framework;
2144-
path = ObjectAL.framework;
2145-
remoteRef = FC39961C19C3B92F00C93E5E /* PBXContainerItemProxy */;
2143+
fileType = archive.ar;
2144+
path = libObjectAL.a;
2145+
remoteRef = FC39961A19C3B92F00C93E5E /* PBXContainerItemProxy */;
21462146
sourceTree = BUILT_PRODUCTS_DIR;
21472147
};
21482148
FC39961F19C3B92F00C93E5E /* libObjectAL (Android).a */ = {
@@ -2375,6 +2375,7 @@
23752375
D2FEB6E7194F6C9E00FC0574 /* ZipUtils.m in Sources */,
23762376
D2FEB6EA194F6C9E00FC0574 /* CCEffectStack.m in Sources */,
23772377
D2FEB6EC194F6C9E00FC0574 /* CCRenderTexture.m in Sources */,
2378+
D28B2E7A19CBA89A00DC6E08 /* CCEffectColorChannelOffset.m in Sources */,
23782379
D2FEB6ED194F6C9E00FC0574 /* CCMotionStreak.m in Sources */,
23792380
D2FEB6EE194F6C9E00FC0574 /* CCSpriteFrame.m in Sources */,
23802381
D2FEB6EF194F6C9E00FC0574 /* CCSpriteFrameCache.m in Sources */,

0 commit comments

Comments
 (0)