diff --git a/configure.ac b/configure.ac index e1fd9e5f5..0b2b92473 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([projectM], [3.0.0], [mischa@mvstg.biz], [projectM], [https://github.com/revmischa/projectm]) +AC_INIT([projectM], [3.1.0-beta1], [mischa@mvstg.biz], [projectM], [https://github.com/revmischa/projectm]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) diff --git a/src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj b/src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj index 12e53c6bc..4c884d6d0 100644 --- a/src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj +++ b/src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj @@ -46,12 +46,33 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 169501421F6EC5E6008FAF86 /* PBXContainerItemProxy */ = { + 168F716821125D85001806E7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */; + containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 169501301F6EC5E5008FAF86; - remoteInfo = libprojectM; + remoteGlobalIDString = 16178B12207A6F4000D3B0C8; + remoteInfo = Renderer; + }; + 168F716A21125D85001806E7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 16A49E57207A7C8C00E508EA; + remoteInfo = projectM; + }; + 168F716C21125D85001806E7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1612C9A4207A855D00862A3A; + remoteInfo = MilkdropPresetFactory; + }; + 168F716E21125D85001806E7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1612C9AC207A856A00862A3A; + remoteInfo = NativePresetFactory; }; /* End PBXContainerItemProxy section */ @@ -92,7 +113,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libprojectM.xcodeproj; path = ../libprojectM/libprojectM/libprojectM.xcodeproj; sourceTree = ""; }; + 168F716121125D85001806E7 /* libprojectM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libprojectM.xcodeproj; path = ../libprojectM/libprojectM.xcodeproj; sourceTree = ""; }; 16A4214420781835006F30CE /* libRenderer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRenderer.a; path = ../libprojectM/Renderer/.libs/libRenderer.a; sourceTree = ""; }; 16A4214520781835006F30CE /* libMilkdropPresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMilkdropPresetFactory.a; path = ../libprojectM/MilkdropPresetFactory/.libs/libMilkdropPresetFactory.a; sourceTree = ""; }; 16A4214620781835006F30CE /* libNativePresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libNativePresetFactory.a; path = ../libprojectM/NativePresetFactory/.libs/libNativePresetFactory.a; sourceTree = ""; }; @@ -185,10 +206,13 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1695013F1F6EC5E5008FAF86 /* Products */ = { + 168F716221125D85001806E7 /* Products */ = { isa = PBXGroup; children = ( - 169501431F6EC5E6008FAF86 /* liblibprojectM.a */, + 168F716921125D85001806E7 /* libRenderer.a */, + 168F716B21125D85001806E7 /* libprojectM.a */, + 168F716D21125D85001806E7 /* libMilkdropPresetFactory.a */, + 168F716F21125D85001806E7 /* libNativePresetFactory.a */, ); name = Products; sourceTree = ""; @@ -227,7 +251,7 @@ C3F9D7A617B82CC3009E58CB = { isa = PBXGroup; children = ( - 1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */, + 168F716121125D85001806E7 /* libprojectM.xcodeproj */, C38212791A5A2114002A8D78 /* gles_conv.txt */, C37EBD5E19A0164400220265 /* selectViz.png */, C37EBD5A19A0118600220265 /* iProjectM.pkg */, @@ -400,8 +424,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 1695013F1F6EC5E5008FAF86 /* Products */; - ProjectRef = 1695013E1F6EC5E5008FAF86 /* libprojectM.xcodeproj */; + ProductGroup = 168F716221125D85001806E7 /* Products */; + ProjectRef = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; }, ); projectRoot = ""; @@ -413,11 +437,32 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 169501431F6EC5E6008FAF86 /* liblibprojectM.a */ = { + 168F716921125D85001806E7 /* libRenderer.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = liblibprojectM.a; - remoteRef = 169501421F6EC5E6008FAF86 /* PBXContainerItemProxy */; + path = libRenderer.a; + remoteRef = 168F716821125D85001806E7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 168F716B21125D85001806E7 /* libprojectM.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libprojectM.a; + remoteRef = 168F716A21125D85001806E7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 168F716D21125D85001806E7 /* libMilkdropPresetFactory.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMilkdropPresetFactory.a; + remoteRef = 168F716C21125D85001806E7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 168F716F21125D85001806E7 /* libNativePresetFactory.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libNativePresetFactory.a; + remoteRef = 168F716E21125D85001806E7 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ diff --git a/src/projectM-sdl/Info.plist b/src/projectM-sdl/Info.plist deleted file mode 100644 index e24a0287e..000000000 --- a/src/projectM-sdl/Info.plist +++ /dev/null @@ -1,17 +0,0 @@ - - - - - CFBundleExecutable - projectM-SDL - CFBundleIdentifier - net.projectm.pmsdl - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - projectM-SDL - CFBundlePackageType - APPL - - - diff --git a/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj b/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj index bab724927..47e635b2d 100644 --- a/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj +++ b/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj @@ -11,13 +11,13 @@ 1612C998207A80A200862A3A /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612C992207A807000862A3A /* libRenderer.a */; }; 1612C9E2207A85C100862A3A /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612C9DF207A85BD00862A3A /* libMilkdropPresetFactory.a */; }; 1612C9E3207A85C100862A3A /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612C9E1207A85BD00862A3A /* libNativePresetFactory.a */; }; - 168F7154211248C1001806E7 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 168F715221124893001806E7 /* Info.plist */; }; 168F7156211248E4001806E7 /* SDLprojectM in Executable */ = {isa = PBXBuildFile; fileRef = C34521441BF02294001707D2 /* SDLprojectM */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 168F715921124C0E001806E7 /* config.inp in Support files */ = {isa = PBXBuildFile; fileRef = 16B52AAA21105A6900830F34 /* config.inp */; }; 168F715A21124C14001806E7 /* fonts in Support files */ = {isa = PBXBuildFile; fileRef = C3D30B8F1BF02BE5009AAACD /* fonts */; }; 168F715C21124CDF001806E7 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 166853F02105E2850042793A /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 169502001F7009E9008FAF86 /* pmSDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 169501FE1F7009E9008FAF86 /* pmSDL.cpp */; }; - C345214F1BF022A5001707D2 /* projectM_SDL_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */; }; + 168F718021126256001806E7 /* AppIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 168F717F21126256001806E7 /* AppIcon.icns */; }; + 168F71812112631C001806E7 /* projectM_SDL_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */; }; + 168F71822112631C001806E7 /* pmSDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 169501FE1F7009E9008FAF86 /* pmSDL.cpp */; }; C345215C1BF025A9001707D2 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215B1BF025A9001707D2 /* OpenGL.framework */; }; C345215E1BF025CF001707D2 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215D1BF025CF001707D2 /* CoreFoundation.framework */; }; C34521651BF025E5001707D2 /* libbz2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215F1BF025E5001707D2 /* libbz2.a */; }; @@ -148,7 +148,8 @@ 166853F22105E2CF0042793A /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2.framework; sourceTree = ""; }; 168F714921120210001806E7 /* projectM SDL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "projectM SDL.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 168F714B21120211001806E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 168F715221124893001806E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 168F717621125ED8001806E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 168F717F21126256001806E7 /* AppIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon.icns; sourceTree = ""; }; 169501FE1F7009E9008FAF86 /* pmSDL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pmSDL.cpp; sourceTree = ""; }; 169501FF1F7009E9008FAF86 /* pmSDL.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pmSDL.hpp; sourceTree = ""; }; 16B52AA8211054E900830F34 /* projectMSDL-pkg.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "projectMSDL-pkg.plist"; sourceTree = ""; }; @@ -221,11 +222,20 @@ 168F714A21120210001806E7 /* projectM-SDL */ = { isa = PBXGroup; children = ( + 168F717F21126256001806E7 /* AppIcon.icns */, 168F714B21120211001806E7 /* Info.plist */, ); path = "projectM-SDL"; sourceTree = ""; }; + 168F717521125ED8001806E7 /* projectM */ = { + isa = PBXGroup; + children = ( + 168F717621125ED8001806E7 /* Info.plist */, + ); + path = projectM; + sourceTree = ""; + }; 16A42128207802AF006F30CE /* Dependencies */ = { isa = PBXGroup; children = ( @@ -242,18 +252,18 @@ C345213B1BF02293001707D2 = { isa = PBXGroup; children = ( - 168F715221124893001806E7 /* Info.plist */, + 169501FF1F7009E9008FAF86 /* pmSDL.hpp */, + 169501FE1F7009E9008FAF86 /* pmSDL.cpp */, + C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */, 16B52AAA21105A6900830F34 /* config.inp */, 16B52AA8211054E900830F34 /* projectMSDL-pkg.plist */, 166853F02105E2850042793A /* SDL2.framework */, 1612CA10207A8D2400862A3A /* shaders */, 1612C98C207A807000862A3A /* libprojectM.xcodeproj */, - 169501FF1F7009E9008FAF86 /* pmSDL.hpp */, - 169501FE1F7009E9008FAF86 /* pmSDL.cpp */, - C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */, C307DFD31D565B57002F6B9E /* presets */, 16A42128207802AF006F30CE /* Dependencies */, 168F714A21120210001806E7 /* projectM-SDL */, + 168F717521125ED8001806E7 /* projectM */, 161070CE1F7041B0001905AB /* Frameworks */, C34521451BF02294001707D2 /* Products */, C3D30B8F1BF02BE5009AAACD /* fonts */, @@ -394,7 +404,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 168F7154211248C1001806E7 /* Info.plist in Resources */, + 168F718021126256001806E7 /* AppIcon.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -430,7 +440,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - 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"; + 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"; }; /* End PBXShellScriptBuildPhase section */ @@ -439,6 +449,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 168F71822112631C001806E7 /* pmSDL.cpp in Sources */, + 168F71812112631C001806E7 /* projectM_SDL_main.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -446,8 +458,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 169502001F7009E9008FAF86 /* pmSDL.cpp in Sources */, - C345214F1BF022A5001707D2 /* projectM_SDL_main.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/src/projectM-sdl/projectM-SDL/AppIcon.icns b/src/projectM-sdl/projectM-SDL/AppIcon.icns new file mode 100644 index 000000000..eb22a4527 Binary files /dev/null and b/src/projectM-sdl/projectM-SDL/AppIcon.icns differ diff --git a/src/projectM-sdl/projectM-SDL/Info.plist b/src/projectM-sdl/projectM-SDL/Info.plist new file mode 100644 index 000000000..71fd065b2 --- /dev/null +++ b/src/projectM-sdl/projectM-SDL/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + SDLprojectM + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + projectM-SDL.app + CFBundlePackageType + BNDL + CFBundleShortVersionString + 3.0 + CFBundleVersion + 1 + NSHumanReadableCopyright + LGPL + CFBundleIconFile + AppIcon + +