Skip to content

Commit c07ba36

Browse files
slembckeslembcke
committed
Merge pull request #1032 from osinoleg/develop
Fixed android test project (works with latest cocos2d project changes).
2 parents db8185f + df94a03 commit c07ba36

File tree

1 file changed

+59
-57
lines changed

1 file changed

+59
-57
lines changed

‎cocos2d-tests-android/Headless.xcodeproj/project.pbxproj‎

Lines changed: 59 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -119,59 +119,59 @@
119119
D242C50F1958D78700E7726D /* TestBase.m in Sources */ = {isa = PBXBuildFile; fileRef = D242C50D1958D78700E7726D /* TestBase.m */; };
120120
D242C5131958D87900E7726D /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D242C5121958D87900E7726D /* CoreText.framework */; };
121121
D28F46271988175F006A017B /* Music in Resources */ = {isa = PBXBuildFile; fileRef = D28F46261988175F006A017B /* Music */; };
122+
D2A8000319F0F9D500ED29F6 /* libcocos2dAndroid.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2A8FFFC19F0F9A500ED29F6 /* libcocos2dAndroid.a */; };
122123
D2BBF573195280150005272F /* libEGL.so in Frameworks */ = {isa = PBXBuildFile; fileRef = D2BBF572195280150005272F /* libEGL.so */; };
123-
D2D0EDF81951262700E9103F /* libcocos2dAndroid.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D0EDF3195125EF00E9103F /* libcocos2dAndroid.a */; };
124124
/* End PBXBuildFile section */
125125

126126
/* Begin PBXContainerItemProxy section */
127-
5B4711C61962544B00739894 /* PBXContainerItemProxy */ = {
128-
isa = PBXContainerItemProxy;
129-
containerPortal = D2D0EDEA195125EF00E9103F /* cocos2d-ios.xcodeproj */;
130-
proxyType = 1;
131-
remoteGlobalIDString = 5BF32679195F8D8800D9A51A;
132-
remoteInfo = cocos2dJava;
133-
};
134127
5B89B01D19462F8200CD2A5E /* PBXContainerItemProxy */ = {
135128
isa = PBXContainerItemProxy;
136129
containerPortal = 5B4D6CB51936ACE5004D1A0B /* Project object */;
137130
proxyType = 1;
138131
remoteGlobalIDString = 5B89B01419462F5800CD2A5E;
139132
remoteInfo = TestJar;
140133
};
141-
5BA67A57196CA1700010FFB7 /* PBXContainerItemProxy */ = {
134+
D2A8000119F0F9C300ED29F6 /* PBXContainerItemProxy */ = {
142135
isa = PBXContainerItemProxy;
143-
containerPortal = D2D0EDEA195125EF00E9103F /* cocos2d-ios.xcodeproj */;
136+
containerPortal = D2A8FFEC19F0F9A400ED29F6 /* cocos2d.xcodeproj */;
144137
proxyType = 1;
145-
remoteGlobalIDString = 5BF32679195F8D8800D9A51A;
146-
remoteInfo = cocos2dJava;
138+
remoteGlobalIDString = D2FEB60D194F6C9E00FC0574;
139+
remoteInfo = cocos2dAndroid;
147140
};
148-
5BF32691195F8E0900D9A51A /* PBXContainerItemProxy */ = {
141+
D2A8000619F0F9E700ED29F6 /* PBXContainerItemProxy */ = {
149142
isa = PBXContainerItemProxy;
150-
containerPortal = D2D0EDEA195125EF00E9103F /* cocos2d-ios.xcodeproj */;
151-
proxyType = 2;
152-
remoteGlobalIDString = 5BF3267A195F8D8800D9A51A;
143+
containerPortal = D2A8FFEC19F0F9A400ED29F6 /* cocos2d.xcodeproj */;
144+
proxyType = 1;
145+
remoteGlobalIDString = 5BF32679195F8D8800D9A51A;
153146
remoteInfo = cocos2dJava;
154147
};
155-
D2D0EDF0195125EF00E9103F /* PBXContainerItemProxy */ = {
148+
D2A8FFF919F0F9A500ED29F6 /* PBXContainerItemProxy */ = {
156149
isa = PBXContainerItemProxy;
157-
containerPortal = D2D0EDEA195125EF00E9103F /* cocos2d-ios.xcodeproj */;
150+
containerPortal = D2A8FFEC19F0F9A400ED29F6 /* cocos2d.xcodeproj */;
158151
proxyType = 2;
159152
remoteGlobalIDString = 5018F24D0DFDEAC400C013A5;
160-
remoteInfo = cocos2d;
153+
remoteInfo = "cocos2d-ios";
161154
};
162-
D2D0EDF2195125EF00E9103F /* PBXContainerItemProxy */ = {
155+
D2A8FFFB19F0F9A500ED29F6 /* PBXContainerItemProxy */ = {
163156
isa = PBXContainerItemProxy;
164-
containerPortal = D2D0EDEA195125EF00E9103F /* cocos2d-ios.xcodeproj */;
157+
containerPortal = D2A8FFEC19F0F9A400ED29F6 /* cocos2d.xcodeproj */;
165158
proxyType = 2;
166159
remoteGlobalIDString = D2FEB74F194F6C9E00FC0574;
167160
remoteInfo = cocos2dAndroid;
168161
};
169-
D2D0EDF61951262200E9103F /* PBXContainerItemProxy */ = {
162+
D2A8FFFD19F0F9A500ED29F6 /* PBXContainerItemProxy */ = {
170163
isa = PBXContainerItemProxy;
171-
containerPortal = D2D0EDEA195125EF00E9103F /* cocos2d-ios.xcodeproj */;
172-
proxyType = 1;
173-
remoteGlobalIDString = D2FEB60D194F6C9E00FC0574;
174-
remoteInfo = cocos2dAndroid;
164+
containerPortal = D2A8FFEC19F0F9A400ED29F6 /* cocos2d.xcodeproj */;
165+
proxyType = 2;
166+
remoteGlobalIDString = 5BF3267A195F8D8800D9A51A;
167+
remoteInfo = cocos2dJava;
168+
};
169+
D2A8FFFF19F0F9A500ED29F6 /* PBXContainerItemProxy */ = {
170+
isa = PBXContainerItemProxy;
171+
containerPortal = D2A8FFEC19F0F9A400ED29F6 /* cocos2d.xcodeproj */;
172+
proxyType = 2;
173+
remoteGlobalIDString = 7A4037A819E37038007B6E8F;
174+
remoteInfo = "cocos2d-mac";
175175
};
176176
/* End PBXContainerItemProxy section */
177177

@@ -308,6 +308,7 @@
308308
D242C5121958D87900E7726D /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
309309
D28F46261988175F006A017B /* Music */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Music; path = ../../Resources/Music; sourceTree = "<group>"; };
310310
D2952D3C19520B9A007C58A7 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; };
311+
D2A8FFEC19F0F9A400ED29F6 /* cocos2d.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d.xcodeproj; path = ../../cocos2d.xcodeproj; sourceTree = "<group>"; };
311312
D2BBF54F195264EA0005272F /* libGLESv3.so */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLESv3.so; path = usr/lib/armeabi/libGLESv3.so; sourceTree = SDKROOT; };
312313
D2BBF55419527B170005272F /* libGLESv3.so */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLESv3.so; path = usr/lib/armv7a/libGLESv3.so; sourceTree = SDKROOT; };
313314
D2BBF55A19527B620005272F /* libGLESv3.so */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLESv3.so; path = usr/lib/x86/libGLESv3.so; sourceTree = SDKROOT; };
@@ -316,17 +317,16 @@
316317
D2BBF56719527EC70005272F /* libGLESv2.so */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLESv2.so; path = usr/lib/x86/libGLESv2.so; sourceTree = SDKROOT; };
317318
D2BBF5701952800B0005272F /* libGLESv1_CM.so */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLESv1_CM.so; path = usr/lib/armv7a/libGLESv1_CM.so; sourceTree = SDKROOT; };
318319
D2BBF572195280150005272F /* libEGL.so */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libEGL.so; path = usr/lib/armv7a/libEGL.so; sourceTree = SDKROOT; };
319-
D2D0EDEA195125EF00E9103F /* cocos2d-ios.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "cocos2d-ios.xcodeproj"; path = "../../cocos2d-ios.xcodeproj"; sourceTree = "<group>"; };
320320
/* End PBXFileReference section */
321321

322322
/* Begin PBXFrameworksBuildPhase section */
323323
5B4D6CBA1936ACE5004D1A0B /* Frameworks */ = {
324324
isa = PBXFrameworksBuildPhase;
325325
buildActionMask = 2147483647;
326326
files = (
327+
D2A8000319F0F9D500ED29F6 /* libcocos2dAndroid.a in Frameworks */,
327328
D242C5131958D87900E7726D /* CoreText.framework in Frameworks */,
328329
5B063DC919636B8C002B1CDE /* OpenAL.framework in Frameworks */,
329-
D2D0EDF81951262700E9103F /* libcocos2dAndroid.a in Frameworks */,
330330
D2BBF573195280150005272F /* libEGL.so in Frameworks */,
331331
5BE088C9194132E600BEA3FF /* BridgeKitV3.framework in Frameworks */,
332332
5B4D6CC31936ACE5004D1A0B /* CoreGraphics.framework in Frameworks */,
@@ -605,20 +605,21 @@
605605
name = Testbed;
606606
sourceTree = "<group>";
607607
};
608-
D2D0EDEB195125EF00E9103F /* Products */ = {
608+
D2A8FFED19F0F9A400ED29F6 /* Products */ = {
609609
isa = PBXGroup;
610610
children = (
611-
D2D0EDF1195125EF00E9103F /* libcocos2d.a */,
612-
D2D0EDF3195125EF00E9103F /* libcocos2dAndroid.a */,
613-
5BF32692195F8E0900D9A51A /* cocos2dJava.jar */,
611+
D2A8FFFA19F0F9A500ED29F6 /* libcocos2d.a */,
612+
D2A8FFFC19F0F9A500ED29F6 /* libcocos2dAndroid.a */,
613+
D2A8FFFE19F0F9A500ED29F6 /* cocos2dJava.jar */,
614+
D2A8000019F0F9A500ED29F6 /* libcocos2d-mac.a */,
614615
);
615616
name = Products;
616617
sourceTree = "<group>";
617618
};
618619
D2D0EDF51951260300E9103F /* libs */ = {
619620
isa = PBXGroup;
620621
children = (
621-
D2D0EDEA195125EF00E9103F /* cocos2d-ios.xcodeproj */,
622+
D2A8FFEC19F0F9A400ED29F6 /* cocos2d.xcodeproj */,
622623
);
623624
name = libs;
624625
sourceTree = "<group>";
@@ -637,8 +638,7 @@
637638
buildRules = (
638639
);
639640
dependencies = (
640-
5B4711C71962544B00739894 /* PBXTargetDependency */,
641-
D2D0EDF71951262200E9103F /* PBXTargetDependency */,
641+
D2A8000219F0F9C300ED29F6 /* PBXTargetDependency */,
642642
5B89B01E19462F8200CD2A5E /* PBXTargetDependency */,
643643
);
644644
name = Headless;
@@ -656,7 +656,7 @@
656656
buildRules = (
657657
);
658658
dependencies = (
659-
5BA67A58196CA1700010FFB7 /* PBXTargetDependency */,
659+
D2A8000719F0F9E700ED29F6 /* PBXTargetDependency */,
660660
);
661661
name = AppJava;
662662
productName = TestJar;
@@ -684,8 +684,8 @@
684684
projectDirPath = "";
685685
projectReferences = (
686686
{
687-
ProductGroup = D2D0EDEB195125EF00E9103F /* Products */;
688-
ProjectRef = D2D0EDEA195125EF00E9103F /* cocos2d-ios.xcodeproj */;
687+
ProductGroup = D2A8FFED19F0F9A400ED29F6 /* Products */;
688+
ProjectRef = D2A8FFEC19F0F9A400ED29F6 /* cocos2d.xcodeproj */;
689689
},
690690
);
691691
projectRoot = "";
@@ -697,25 +697,32 @@
697697
/* End PBXProject section */
698698

699699
/* Begin PBXReferenceProxy section */
700-
5BF32692195F8E0900D9A51A /* cocos2dJava.jar */ = {
700+
D2A8000019F0F9A500ED29F6 /* libcocos2d-mac.a */ = {
701701
isa = PBXReferenceProxy;
702-
fileType = compiled.java.jar;
703-
path = cocos2dJava.jar;
704-
remoteRef = 5BF32691195F8E0900D9A51A /* PBXContainerItemProxy */;
702+
fileType = archive.ar;
703+
path = "libcocos2d-mac.a";
704+
remoteRef = D2A8FFFF19F0F9A500ED29F6 /* PBXContainerItemProxy */;
705705
sourceTree = BUILT_PRODUCTS_DIR;
706706
};
707-
D2D0EDF1195125EF00E9103F /* libcocos2d.a */ = {
707+
D2A8FFFA19F0F9A500ED29F6 /* libcocos2d.a */ = {
708708
isa = PBXReferenceProxy;
709709
fileType = archive.ar;
710710
path = libcocos2d.a;
711-
remoteRef = D2D0EDF0195125EF00E9103F /* PBXContainerItemProxy */;
711+
remoteRef = D2A8FFF919F0F9A500ED29F6 /* PBXContainerItemProxy */;
712712
sourceTree = BUILT_PRODUCTS_DIR;
713713
};
714-
D2D0EDF3195125EF00E9103F /* libcocos2dAndroid.a */ = {
714+
D2A8FFFC19F0F9A500ED29F6 /* libcocos2dAndroid.a */ = {
715715
isa = PBXReferenceProxy;
716716
fileType = archive.ar;
717717
path = libcocos2dAndroid.a;
718-
remoteRef = D2D0EDF2195125EF00E9103F /* PBXContainerItemProxy */;
718+
remoteRef = D2A8FFFB19F0F9A500ED29F6 /* PBXContainerItemProxy */;
719+
sourceTree = BUILT_PRODUCTS_DIR;
720+
};
721+
D2A8FFFE19F0F9A500ED29F6 /* cocos2dJava.jar */ = {
722+
isa = PBXReferenceProxy;
723+
fileType = compiled.java.jar;
724+
path = cocos2dJava.jar;
725+
remoteRef = D2A8FFFD19F0F9A500ED29F6 /* PBXContainerItemProxy */;
719726
sourceTree = BUILT_PRODUCTS_DIR;
720727
};
721728
/* End PBXReferenceProxy section */
@@ -854,25 +861,20 @@
854861
/* End PBXSourcesBuildPhase section */
855862

856863
/* Begin PBXTargetDependency section */
857-
5B4711C71962544B00739894 /* PBXTargetDependency */ = {
858-
isa = PBXTargetDependency;
859-
name = cocos2dJava;
860-
targetProxy = 5B4711C61962544B00739894 /* PBXContainerItemProxy */;
861-
};
862864
5B89B01E19462F8200CD2A5E /* PBXTargetDependency */ = {
863865
isa = PBXTargetDependency;
864866
target = 5B89B01419462F5800CD2A5E /* AppJava */;
865867
targetProxy = 5B89B01D19462F8200CD2A5E /* PBXContainerItemProxy */;
866868
};
867-
5BA67A58196CA1700010FFB7 /* PBXTargetDependency */ = {
869+
D2A8000219F0F9C300ED29F6 /* PBXTargetDependency */ = {
868870
isa = PBXTargetDependency;
869-
name = cocos2dJava;
870-
targetProxy = 5BA67A57196CA1700010FFB7 /* PBXContainerItemProxy */;
871+
name = cocos2dAndroid;
872+
targetProxy = D2A8000119F0F9C300ED29F6 /* PBXContainerItemProxy */;
871873
};
872-
D2D0EDF71951262200E9103F /* PBXTargetDependency */ = {
874+
D2A8000719F0F9E700ED29F6 /* PBXTargetDependency */ = {
873875
isa = PBXTargetDependency;
874-
name = cocos2dAndroid;
875-
targetProxy = D2D0EDF61951262200E9103F /* PBXContainerItemProxy */;
876+
name = cocos2dJava;
877+
targetProxy = D2A8000619F0F9E700ED29F6 /* PBXContainerItemProxy */;
876878
};
877879
/* End PBXTargetDependency section */
878880

0 commit comments

Comments
 (0)