Skip to content

Commit 0a863c4

Browse files
committed
#15 osx cocoa PR preparation
2 parents 61488d9 + 8769bdb commit 0a863c4

File tree

2 files changed

+29
-227
lines changed

2 files changed

+29
-227
lines changed

src/platform/osx/OpenLara.xcodeproj/project.pbxproj

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,18 @@
88

99
/* Begin PBXBuildFile section */
1010
99713CC9204CAD9900006FAC /* tinflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 99713CC8204CAD9900006FAC /* tinflate.c */; };
11-
99BFB6A21DCA7F5300E2E997 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BFB6A11DCA7F5300E2E997 /* main.cpp */; };
11+
523F97E41DDF7AA5006FE2FC /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 523F97E31DDF7AA5006FE2FC /* Cocoa.framework */; };
12+
523F97E61DDF926E006FE2FC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 523F97E51DDF926E006FE2FC /* QuartzCore.framework */; };
13+
99BFB6A21DCA7F5300E2E997 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 99BFB6A11DCA7F5300E2E997 /* main.mm */; };
1214
99BFB6A91DCA87BF00E2E997 /* stb_vorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 99BFB6A81DCA87BF00E2E997 /* stb_vorbis.c */; };
1315
99BFB6AB1DCA87C500E2E997 /* minimp3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99BFB6AA1DCA87C500E2E997 /* minimp3.cpp */; };
14-
99C4C0B71796AB730032DE85 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C4C0951796A9730032DE85 /* AGL.framework */; };
15-
99C4C0B91796AB7B0032DE85 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C4C0B81796AB7B0032DE85 /* Carbon.framework */; };
1616
99C4C0BA1796AB810032DE85 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99C4C0931796A96F0032DE85 /* OpenGL.framework */; };
1717
99DF7BC41DCBA30B00C40D0A /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99DF7BC31DCBA30B00C40D0A /* AudioToolbox.framework */; };
1818
/* End PBXBuildFile section */
1919

2020
/* Begin PBXFileReference section */
21+
523F97E31DDF7AA5006FE2FC /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
22+
523F97E51DDF926E006FE2FC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
2123
995C97EF1E91A857003825B2 /* shaders */ = {isa = PBXFileReference; lastKnownFileType = folder; name = shaders; path = ../../shaders; sourceTree = "<group>"; };
2224
99713CAE204CA3DA00006FAC /* animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = animation.h; path = ../../animation.h; sourceTree = "<group>"; };
2325
99713CAF204CA3DA00006FAC /* cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cache.h; path = ../../cache.h; sourceTree = "<group>"; };
@@ -64,10 +66,10 @@
6466
isa = PBXFrameworksBuildPhase;
6567
buildActionMask = 2147483647;
6668
files = (
69+
523F97E61DDF926E006FE2FC /* QuartzCore.framework in Frameworks */,
70+
523F97E41DDF7AA5006FE2FC /* Cocoa.framework in Frameworks */,
6771
99DF7BC41DCBA30B00C40D0A /* AudioToolbox.framework in Frameworks */,
6872
99C4C0BA1796AB810032DE85 /* OpenGL.framework in Frameworks */,
69-
99C4C0B91796AB7B0032DE85 /* Carbon.framework in Frameworks */,
70-
99C4C0B71796AB730032DE85 /* AGL.framework in Frameworks */,
7173
);
7274
runOnlyForDeploymentPostprocessing = 0;
7375
};
@@ -107,7 +109,25 @@
107109
99BFB6AA1DCA87C500E2E997 /* minimp3.cpp */,
108110
99BFB6A81DCA87BF00E2E997 /* stb_vorbis.c */,
109111
99713CC8204CAD9900006FAC /* tinflate.c */,
110-
99BFB6A11DCA7F5300E2E997 /* main.cpp */,
112+
99BFB69E1DCA7F1700E2E997 /* libs */,
113+
99BFB6A11DCA7F5300E2E997 /* main.mm */,
114+
99BFB68D1DCA7F1700E2E997 /* lara.h */,
115+
99BFB68E1DCA7F1700E2E997 /* format.h */,
116+
99BFB68F1DCA7F1700E2E997 /* level.h */,
117+
99BFB6901DCA7F1700E2E997 /* mesh.h */,
118+
99BFB6911DCA7F1700E2E997 /* debug.h */,
119+
99BFB6921DCA7F1700E2E997 /* controller.h */,
120+
99BFB6931DCA7F1700E2E997 /* utils.h */,
121+
99BFB6941DCA7F1700E2E997 /* sound.h */,
122+
99BFB6951DCA7F1700E2E997 /* camera.h */,
123+
99BFB6961DCA7F1700E2E997 /* core.h */,
124+
99BFB6971DCA7F1700E2E997 /* trigger.h */,
125+
99BFB6981DCA7F1700E2E997 /* shader.h */,
126+
99BFB6991DCA7F1700E2E997 /* shader.glsl */,
127+
99BFB69A1DCA7F1700E2E997 /* input.h */,
128+
99BFB69B1DCA7F1700E2E997 /* enemy.h */,
129+
99BFB69C1DCA7F1700E2E997 /* game.h */,
130+
99BFB69D1DCA7F1700E2E997 /* texture.h */,
111131
99C4C0A31796AACF0032DE85 /* Supporting Files */,
112132
99C4C0821796A8230032DE85 /* Frameworks */,
113133
99C4C0811796A8230032DE85 /* Products */,
@@ -125,6 +145,8 @@
125145
99C4C0821796A8230032DE85 /* Frameworks */ = {
126146
isa = PBXGroup;
127147
children = (
148+
523F97E51DDF926E006FE2FC /* QuartzCore.framework */,
149+
523F97E31DDF7AA5006FE2FC /* Cocoa.framework */,
128150
99DF7BC31DCBA30B00C40D0A /* AudioToolbox.framework */,
129151
99DF7BC11DCBA2D100C40D0A /* CoreAudioKit.framework */,
130152
99DF7BBF1DCBA2BF00C40D0A /* CoreAudio.framework */,
@@ -207,7 +229,7 @@
207229
files = (
208230
99713CC9204CAD9900006FAC /* tinflate.c in Sources */,
209231
99BFB6AB1DCA87C500E2E997 /* minimp3.cpp in Sources */,
210-
99BFB6A21DCA7F5300E2E997 /* main.cpp in Sources */,
232+
99BFB6A21DCA7F5300E2E997 /* main.mm in Sources */,
211233
99BFB6A91DCA87BF00E2E997 /* stb_vorbis.c in Sources */,
212234
);
213235
runOnlyForDeploymentPostprocessing = 0;

src/platform/osx/main.cpp

Lines changed: 0 additions & 220 deletions
This file was deleted.

0 commit comments

Comments
 (0)