Skip to content

Commit 6941c48

Browse files
revmischarevmischa
committed
osx packaging w/ xcode
1 parent 8ab1f87 commit 6941c48

File tree

6 files changed

+107
-43
lines changed

6 files changed

+107
-43
lines changed

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([projectM], [3.0.0], [[email protected]], [projectM], [https://github.com/revmischa/projectm])
1+
AC_INIT([projectM], [3.1.0-beta1], [[email protected]], [projectM], [https://github.com/revmischa/projectm])
22
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax])
33

44
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])

‎src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj‎

Lines changed: 58 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,33 @@
4646
/* End PBXBuildFile section */
4747

4848
/* Begin PBXContainerItemProxy section */
49-
169501421F6EC5E6008FAF86 /* PBXContainerItemProxy */ = {
49+
168F716821125D85001806E7 /* PBXContainerItemProxy */ = {
5050
isa = PBXContainerItemProxy;
51-
containerPortal = 1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */;
51+
containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */;
5252
proxyType = 2;
53-
remoteGlobalIDString = 169501301F6EC5E5008FAF86;
54-
remoteInfo = libprojectM;
53+
remoteGlobalIDString = 16178B12207A6F4000D3B0C8;
54+
remoteInfo = Renderer;
55+
};
56+
168F716A21125D85001806E7 /* PBXContainerItemProxy */ = {
57+
isa = PBXContainerItemProxy;
58+
containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */;
59+
proxyType = 2;
60+
remoteGlobalIDString = 16A49E57207A7C8C00E508EA;
61+
remoteInfo = projectM;
62+
};
63+
168F716C21125D85001806E7 /* PBXContainerItemProxy */ = {
64+
isa = PBXContainerItemProxy;
65+
containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */;
66+
proxyType = 2;
67+
remoteGlobalIDString = 1612C9A4207A855D00862A3A;
68+
remoteInfo = MilkdropPresetFactory;
69+
};
70+
168F716E21125D85001806E7 /* PBXContainerItemProxy */ = {
71+
isa = PBXContainerItemProxy;
72+
containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */;
73+
proxyType = 2;
74+
remoteGlobalIDString = 1612C9AC207A856A00862A3A;
75+
remoteInfo = NativePresetFactory;
5576
};
5677
/* End PBXContainerItemProxy section */
5778

@@ -92,7 +113,7 @@
92113
/* End PBXCopyFilesBuildPhase section */
93114

94115
/* Begin PBXFileReference section */
95-
1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libprojectM.xcodeproj; path = ../libprojectM/libprojectM/libprojectM.xcodeproj; sourceTree = "<group>"; };
116+
168F716121125D85001806E7 /* libprojectM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libprojectM.xcodeproj; path = ../libprojectM/libprojectM.xcodeproj; sourceTree = "<group>"; };
96117
16A4214420781835006F30CE /* libRenderer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRenderer.a; path = ../libprojectM/Renderer/.libs/libRenderer.a; sourceTree = "<group>"; };
97118
16A4214520781835006F30CE /* libMilkdropPresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMilkdropPresetFactory.a; path = ../libprojectM/MilkdropPresetFactory/.libs/libMilkdropPresetFactory.a; sourceTree = "<group>"; };
98119
16A4214620781835006F30CE /* libNativePresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libNativePresetFactory.a; path = ../libprojectM/NativePresetFactory/.libs/libNativePresetFactory.a; sourceTree = "<group>"; };
@@ -185,10 +206,13 @@
185206
/* End PBXFrameworksBuildPhase section */
186207

187208
/* Begin PBXGroup section */
188-
1695013F1F6EC5E5008FAF86 /* Products */ = {
209+
168F716221125D85001806E7 /* Products */ = {
189210
isa = PBXGroup;
190211
children = (
191-
169501431F6EC5E6008FAF86 /* liblibprojectM.a */,
212+
168F716921125D85001806E7 /* libRenderer.a */,
213+
168F716B21125D85001806E7 /* libprojectM.a */,
214+
168F716D21125D85001806E7 /* libMilkdropPresetFactory.a */,
215+
168F716F21125D85001806E7 /* libNativePresetFactory.a */,
192216
);
193217
name = Products;
194218
sourceTree = "<group>";
@@ -227,7 +251,7 @@
227251
C3F9D7A617B82CC3009E58CB = {
228252
isa = PBXGroup;
229253
children = (
230-
1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */,
254+
168F716121125D85001806E7 /* libprojectM.xcodeproj */,
231255
C38212791A5A2114002A8D78 /* gles_conv.txt */,
232256
C37EBD5E19A0164400220265 /* selectViz.png */,
233257
C37EBD5A19A0118600220265 /* iProjectM.pkg */,
@@ -400,8 +424,8 @@
400424
projectDirPath = "";
401425
projectReferences = (
402426
{
403-
ProductGroup = 1695013F1F6EC5E5008FAF86 /* Products */;
404-
ProjectRef = 1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */;
427+
ProductGroup = 168F716221125D85001806E7 /* Products */;
428+
ProjectRef = 168F716121125D85001806E7 /* libprojectM.xcodeproj */;
405429
},
406430
);
407431
projectRoot = "";
@@ -413,11 +437,32 @@
413437
/* End PBXProject section */
414438

415439
/* Begin PBXReferenceProxy section */
416-
169501431F6EC5E6008FAF86 /* liblibprojectM.a */ = {
440+
168F716921125D85001806E7 /* libRenderer.a */ = {
441+
isa = PBXReferenceProxy;
442+
fileType = archive.ar;
443+
path = libRenderer.a;
444+
remoteRef = 168F716821125D85001806E7 /* PBXContainerItemProxy */;
445+
sourceTree = BUILT_PRODUCTS_DIR;
446+
};
447+
168F716B21125D85001806E7 /* libprojectM.a */ = {
448+
isa = PBXReferenceProxy;
449+
fileType = archive.ar;
450+
path = libprojectM.a;
451+
remoteRef = 168F716A21125D85001806E7 /* PBXContainerItemProxy */;
452+
sourceTree = BUILT_PRODUCTS_DIR;
453+
};
454+
168F716D21125D85001806E7 /* libMilkdropPresetFactory.a */ = {
455+
isa = PBXReferenceProxy;
456+
fileType = archive.ar;
457+
path = libMilkdropPresetFactory.a;
458+
remoteRef = 168F716C21125D85001806E7 /* PBXContainerItemProxy */;
459+
sourceTree = BUILT_PRODUCTS_DIR;
460+
};
461+
168F716F21125D85001806E7 /* libNativePresetFactory.a */ = {
417462
isa = PBXReferenceProxy;
418463
fileType = archive.ar;
419-
path = liblibprojectM.a;
420-
remoteRef = 169501421F6EC5E6008FAF86 /* PBXContainerItemProxy */;
464+
path = libNativePresetFactory.a;
465+
remoteRef = 168F716E21125D85001806E7 /* PBXContainerItemProxy */;
421466
sourceTree = BUILT_PRODUCTS_DIR;
422467
};
423468
/* End PBXReferenceProxy section */

‎src/projectM-sdl/Info.plist‎

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

‎src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
1612C998207A80A200862A3A /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612C992207A807000862A3A /* libRenderer.a */; };
1212
1612C9E2207A85C100862A3A /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612C9DF207A85BD00862A3A /* libMilkdropPresetFactory.a */; };
1313
1612C9E3207A85C100862A3A /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612C9E1207A85BD00862A3A /* libNativePresetFactory.a */; };
14-
168F7154211248C1001806E7 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 168F715221124893001806E7 /* Info.plist */; };
1514
168F7156211248E4001806E7 /* SDLprojectM in Executable */ = {isa = PBXBuildFile; fileRef = C34521441BF02294001707D2 /* SDLprojectM */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
1615
168F715921124C0E001806E7 /* config.inp in Support files */ = {isa = PBXBuildFile; fileRef = 16B52AAA21105A6900830F34 /* config.inp */; };
1716
168F715A21124C14001806E7 /* fonts in Support files */ = {isa = PBXBuildFile; fileRef = C3D30B8F1BF02BE5009AAACD /* fonts */; };
1817
168F715C21124CDF001806E7 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 166853F02105E2850042793A /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
19-
169502001F7009E9008FAF86 /* pmSDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 169501FE1F7009E9008FAF86 /* pmSDL.cpp */; };
20-
C345214F1BF022A5001707D2 /* projectM_SDL_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */; };
18+
168F718021126256001806E7 /* AppIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 168F717F21126256001806E7 /* AppIcon.icns */; };
19+
168F71812112631C001806E7 /* projectM_SDL_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */; };
20+
168F71822112631C001806E7 /* pmSDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 169501FE1F7009E9008FAF86 /* pmSDL.cpp */; };
2121
C345215C1BF025A9001707D2 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215B1BF025A9001707D2 /* OpenGL.framework */; };
2222
C345215E1BF025CF001707D2 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215D1BF025CF001707D2 /* CoreFoundation.framework */; };
2323
C34521651BF025E5001707D2 /* libbz2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215F1BF025E5001707D2 /* libbz2.a */; };
@@ -148,7 +148,8 @@
148148
166853F22105E2CF0042793A /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2.framework; sourceTree = "<group>"; };
149149
168F714921120210001806E7 /* projectM SDL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "projectM SDL.app"; sourceTree = BUILT_PRODUCTS_DIR; };
150150
168F714B21120211001806E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
151-
168F715221124893001806E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
151+
168F717621125ED8001806E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
152+
168F717F21126256001806E7 /* AppIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon.icns; sourceTree = "<group>"; };
152153
169501FE1F7009E9008FAF86 /* pmSDL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pmSDL.cpp; sourceTree = "<group>"; };
153154
169501FF1F7009E9008FAF86 /* pmSDL.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pmSDL.hpp; sourceTree = "<group>"; };
154155
16B52AA8211054E900830F34 /* projectMSDL-pkg.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "projectMSDL-pkg.plist"; sourceTree = "<group>"; };
@@ -221,11 +222,20 @@
221222
168F714A21120210001806E7 /* projectM-SDL */ = {
222223
isa = PBXGroup;
223224
children = (
225+
168F717F21126256001806E7 /* AppIcon.icns */,
224226
168F714B21120211001806E7 /* Info.plist */,
225227
);
226228
path = "projectM-SDL";
227229
sourceTree = "<group>";
228230
};
231+
168F717521125ED8001806E7 /* projectM */ = {
232+
isa = PBXGroup;
233+
children = (
234+
168F717621125ED8001806E7 /* Info.plist */,
235+
);
236+
path = projectM;
237+
sourceTree = "<group>";
238+
};
229239
16A42128207802AF006F30CE /* Dependencies */ = {
230240
isa = PBXGroup;
231241
children = (
@@ -242,18 +252,18 @@
242252
C345213B1BF02293001707D2 = {
243253
isa = PBXGroup;
244254
children = (
245-
168F715221124893001806E7 /* Info.plist */,
255+
169501FF1F7009E9008FAF86 /* pmSDL.hpp */,
256+
169501FE1F7009E9008FAF86 /* pmSDL.cpp */,
257+
C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */,
246258
16B52AAA21105A6900830F34 /* config.inp */,
247259
16B52AA8211054E900830F34 /* projectMSDL-pkg.plist */,
248260
166853F02105E2850042793A /* SDL2.framework */,
249261
1612CA10207A8D2400862A3A /* shaders */,
250262
1612C98C207A807000862A3A /* libprojectM.xcodeproj */,
251-
169501FF1F7009E9008FAF86 /* pmSDL.hpp */,
252-
169501FE1F7009E9008FAF86 /* pmSDL.cpp */,
253-
C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */,
254263
C307DFD31D565B57002F6B9E /* presets */,
255264
16A42128207802AF006F30CE /* Dependencies */,
256265
168F714A21120210001806E7 /* projectM-SDL */,
266+
168F717521125ED8001806E7 /* projectM */,
257267
161070CE1F7041B0001905AB /* Frameworks */,
258268
C34521451BF02294001707D2 /* Products */,
259269
C3D30B8F1BF02BE5009AAACD /* fonts */,
@@ -394,7 +404,7 @@
394404
isa = PBXResourcesBuildPhase;
395405
buildActionMask = 2147483647;
396406
files = (
397-
168F7154211248C1001806E7 /* Info.plist in Resources */,
407+
168F718021126256001806E7 /* AppIcon.icns in Resources */,
398408
);
399409
runOnlyForDeploymentPostprocessing = 0;
400410
};
@@ -430,7 +440,7 @@
430440
);
431441
runOnlyForDeploymentPostprocessing = 0;
432442
shellPath = /bin/sh;
433-
shellScript = "ls \"$CONFIGURATION_BUILD_DIR\"\n\nmkdir -p \"$DSTROOT/Applications\"\ncp -rp \"$CONFIGURATION_BUILD_DIR/projectM SDL.app\" \"$DSTROOT/Applications\"\npkgbuild --component-plist \"$SRCROOT/projectMSDL-pkg.plist\" --root \"$DSTROOT\" \"$BUILT_PRODUCTS_DIR/projectM.pkg\"\n\necho \"Created installer package $BUILT_PRODUCTS_DIR/projectM SDL.pkg\"\n";
443+
shellScript = "ls \"$CONFIGURATION_BUILD_DIR\"\n\nmkdir -p \"$DSTROOT/Applications\"\ncp -rp \"$CONFIGURATION_BUILD_DIR/projectM SDL.app\" \"$DSTROOT/Applications\"\npkgbuild --component-plist \"$SRCROOT/projectMSDL-pkg.plist\" --root \"$DSTROOT\" \"$BUILT_PRODUCTS_DIR/projectM SDL.pkg\"\n\necho \"Created installer package $BUILT_PRODUCTS_DIR/projectM SDL.pkg\"\n";
434444
};
435445
/* End PBXShellScriptBuildPhase section */
436446

@@ -439,15 +449,15 @@
439449
isa = PBXSourcesBuildPhase;
440450
buildActionMask = 2147483647;
441451
files = (
452+
168F71822112631C001806E7 /* pmSDL.cpp in Sources */,
453+
168F71812112631C001806E7 /* projectM_SDL_main.cpp in Sources */,
442454
);
443455
runOnlyForDeploymentPostprocessing = 0;
444456
};
445457
C34521401BF02293001707D2 /* Sources */ = {
446458
isa = PBXSourcesBuildPhase;
447459
buildActionMask = 2147483647;
448460
files = (
449-
169502001F7009E9008FAF86 /* pmSDL.cpp in Sources */,
450-
C345214F1BF022A5001707D2 /* projectM_SDL_main.cpp in Sources */,
451461
);
452462
runOnlyForDeploymentPostprocessing = 0;
453463
};

‎src/projectM-sdl/projectM-SDL/AppIcon.icns‎

537 KB
Binary file not shown.

‎src/projectM-sdl/projectM-SDL/Info.plist‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>SDLprojectM</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>projectM-SDL.app</string>
15+
<key>CFBundlePackageType</key>
16+
<string>BNDL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>3.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>1</string>
21+
<key>NSHumanReadableCopyright</key>
22+
<string>LGPL</string>
23+
<key>CFBundleIconFile</key>
24+
<string>AppIcon</string>
25+
</dict>
26+
</plist>

0 commit comments

Comments
 (0)