diff --git a/Installer.xcodeproj/project.pbxproj b/Installer.xcodeproj/project.pbxproj index 8b1bf9738..ccc620636 100644 --- a/Installer.xcodeproj/project.pbxproj +++ b/Installer.xcodeproj/project.pbxproj @@ -23,6 +23,10 @@ }; /* End PBXAggregateTarget section */ +/* Begin PBXBuildFile section */ + 16CF110C25E1B35F00B4A951 /* Distribution.xml in CopyFiles */ = {isa = PBXBuildFile; fileRef = 16CF110B25E1B35F00B4A951 /* Distribution.xml */; }; +/* End PBXBuildFile section */ + /* Begin PBXContainerItemProxy section */ 1648A64525D7FD520075B8FC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -68,6 +72,7 @@ dstPath = ""; dstSubfolderSpec = 16; files = ( + 16CF110C25E1B35F00B4A951 /* Distribution.xml in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -77,6 +82,7 @@ 1648A64025D7FD520075B8FC /* SDLprojectM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDLprojectM.xcodeproj; path = "src/projectM-sdl/SDLprojectM.xcodeproj"; sourceTree = ""; }; 168E975025D7FDDA0073B1B8 /* Music Plugin.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "Music Plugin.xcodeproj"; path = "src/projectM-MusicPlugin/Music Plugin.xcodeproj"; sourceTree = ""; }; 168E976E25D800F90073B1B8 /* ProjectM-MusicPlugin.pkg */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ProjectM-MusicPlugin.pkg"; path = "src/projectM-MusicPlugin/ProjectM-MusicPlugin.pkg"; sourceTree = ""; }; + 16CF110B25E1B35F00B4A951 /* Distribution.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = Distribution.xml; path = mac/Distribution.xml; sourceTree = ""; }; 16F25E9C25D81737002EC64E /* ProjectM-SDL.pkg */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ProjectM-SDL.pkg"; path = "src/projectM-sdl/ProjectM-SDL.pkg"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -84,6 +90,7 @@ 1648A5E725D7FB650075B8FC = { isa = PBXGroup; children = ( + 16CF110B25E1B35F00B4A951 /* Distribution.xml */, 16F25E9C25D81737002EC64E /* ProjectM-SDL.pkg */, 168E976E25D800F90073B1B8 /* ProjectM-MusicPlugin.pkg */, 168E975025D7FDDA0073B1B8 /* Music Plugin.xcodeproj */, @@ -200,7 +207,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -euxo pipefail\n\necho BUILT_PRODUCTS_DIR $BUILT_PRODUCTS_DIR\nls \"$BUILT_PRODUCTS_DIR\"\n\nmkdir -p \"$TEMP_DIR\"\n\nSDL_PKG=\"$BUILT_PRODUCTS_DIR/ProjectM-SDL.pkg\"\nMUSIC_PLUGIN_PKG=\"$BUILT_PRODUCTS_DIR/ProjectM-MusicPlugin.pkg\"\n\nproductbuild --timestamp --sign '5926VBQM6Y' --package $SDL_PKG --package $MUSIC_PLUGIN_PKG \"$BUILT_PRODUCTS_DIR/ProjectM.pkg\"\n#productbuild --package \"$SDL_PKG\" --package \"$MUSIC_PLUGIN_PKG\" \"$TEMP_DIR/ProjectM.pkg\"\n\necho \"Created installer package $TEMP_DIR/ProjectM.pkg\"\n\ncp -rp \"$TEMP_DIR/ProjectM.pkg\" \"$SRCROOT/\"\n"; + shellScript = "set -euxo pipefail\n\necho BUILT_PRODUCTS_DIR $BUILT_PRODUCTS_DIR\nls \"$BUILT_PRODUCTS_DIR\"\n\nmkdir -p \"$TEMP_DIR\"\n\nSDL_PKG=\"$BUILT_PRODUCTS_DIR/ProjectM-SDL.pkg\"\nMUSIC_PLUGIN_PKG=\"$BUILT_PRODUCTS_DIR/ProjectM-MusicPlugin.pkg\"\n\n#productbuild --timestamp --sign '5926VBQM6Y' --package $SDL_PKG --package $MUSIC_PLUGIN_PKG \"$TEMP_DIR/ProjectM.pkg\"\nproductbuild --timestamp --sign '5926VBQM6Y' --distribution mac/Distribution.xml --package-path \"$BUILT_PRODUCTS_DIR\" \"$TEMP_DIR/ProjectM.pkg\"\n#productbuild --package \"$SDL_PKG\" --package \"$MUSIC_PLUGIN_PKG\" \"$TEMP_DIR/ProjectM.pkg\"\n\necho \"Created installer package $TEMP_DIR/ProjectM.pkg\"\n\ncp -rp \"$TEMP_DIR/ProjectM.pkg\" \"$SRCROOT/\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ diff --git a/Makefile.am b/Makefile.am index 90d7258bc..2e61675b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,10 +40,16 @@ build-mac: macOS/Build/Products/Debug/presets open macOS/Build/Products/Debug ProjectM.pkg: - xcrun xcodebuild -scheme "ProjectM Installer" -configuration Release archive -archivePath build/ProjectM.xcarchive + xcrun xcodebuild -allowProvisioningUpdates -scheme "ProjectM Installer" -configuration Release archive -archivePath build/ProjectM.xcarchive # do a macOS build dist-mac: dist ProjectM.pkg + xcrun altool --notarize-app --primary-bundle-id "net.projectm.installer" \ + --asc-provider 'MischaSpiegelmock10100337' \ + --username thadwooster@gmail.com --password @keychain:AC_PASSWORD \ + --file "$(PWD)/ProjectM.pkg" + @echo "Progress: $ xcrun altool -u thadwooster@gmail.com -p @keychain:AC_PASSWORD --notarization-info UUID" + @echo "Staple: $ xcrun stapler staple $(PWD)/dist/projectM-macOS.pkg" rm -rf dist mkdir -p dist mv ProjectM.pkg dist/projectM-macOS.pkg diff --git a/background.png b/background.png new file mode 100644 index 000000000..9317007e4 Binary files /dev/null and b/background.png differ diff --git a/configure.ac b/configure.ac index a62e8dfc5..6bc335b5d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([projectM], [3.1.12], [me@mish.dev], [projectM], [https://github.com/projectM-visualizer/projectm/]) +AC_INIT([projectM], [3.1.13], [me@mish.dev], [projectM], [https://github.com/projectM-visualizer/projectm/]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax]) AX_IS_RELEASE([git-directory]) diff --git a/mac/Distribution.xml b/mac/Distribution.xml new file mode 100644 index 000000000..f9b11e887 --- /dev/null +++ b/mac/Distribution.xml @@ -0,0 +1,24 @@ + + + projectM Visualizer + + + + + + + + + + + + + + + + ProjectM-MusicPlugin.pkg + + + + ProjectM-SDL.pkg + diff --git a/mac/notarize.sh b/mac/notarize.sh new file mode 100755 index 000000000..81f1a3506 --- /dev/null +++ b/mac/notarize.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +DIR="$( dirname "$_" )" + +xcrun altool --notarize-app --primary-bundle-id "net.projectm.installer" \ + --asc-provider 'MischaSpiegelmock10100337' \ + --username thadwooster@gmail.com --password @keychain:AC_PASSWORD \ + --file "$DIR/../ProjectM.pkg" + +# sleep 60 +# xcrun altool --notarization-history 0 $AUTH +# xcrun stapler staple "$DIR/../ProjectM.pkg" diff --git a/src/projectM-MusicPlugin/Music Plugin.xcodeproj/project.pbxproj b/src/projectM-MusicPlugin/Music Plugin.xcodeproj/project.pbxproj index 8fa48fd2b..c5ee28a0f 100644 --- a/src/projectM-MusicPlugin/Music Plugin.xcodeproj/project.pbxproj +++ b/src/projectM-MusicPlugin/Music Plugin.xcodeproj/project.pbxproj @@ -311,7 +311,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "set -euxo pipefail\n\nPOUT=\"$BUILT_PRODUCTS_DIR\"/\"$CONTENTS_FOLDER_PATH/Resources/presets\"\nPIN=\"$SRCROOT\"/../../presets\n\nmkdir -p \"$POUT\"\nfor preset_dir in \"$PIN/\"*; do\ncp \"$preset_dir/\"* \"$POUT/\"\ndone\necho \"Copied presets to $POUT\"\n\nPKGNAME=ProjectM-MusicPlugin.pkg\n\nmkdir -p \"$TEMP_DIR\"\npkgbuild --timestamp --sign '5926VBQM6Y' --component-plist \"$SRCROOT/Properties/ProjectM-pkg.plist\" --root \"$DSTROOT\" \"$TEMP_DIR/$PKGNAME\"\n\n# for combined installer\ncp \"$TEMP_DIR/$PKGNAME\" \"$BUILT_PRODUCTS_DIR/\"\n\n# for convenience\nmv \"$TEMP_DIR/$PKGNAME\" \"$SRCROOT/\"\n"; + shellScript = "set -euxo pipefail\n\nPOUT=\"$BUILT_PRODUCTS_DIR\"/\"$CONTENTS_FOLDER_PATH/Resources/presets\"\nPIN=\"$SRCROOT\"/../../presets\n\nmkdir -p \"$POUT\"\nfor preset_dir in \"$PIN/\"*; do\ncp \"$preset_dir/\"* \"$POUT/\"\ndone\necho \"Copied presets to $POUT\"\n\nPKGNAME=ProjectM-MusicPlugin.pkg\n\nmkdir -p \"$TEMP_DIR\"\npkgbuild --timestamp --sign '5926VBQM6Y' --component-plist \"$SRCROOT/Properties/ProjectM-pkg.plist\" --root \"$DSTROOT\" \"$TEMP_DIR/$PKGNAME\"\n#pkgbuild --component-plist \"$SRCROOT/Properties/ProjectM-pkg.plist\" --root \"$DSTROOT\" \"$TEMP_DIR/$PKGNAME\"\n\n# for combined installer\ncp \"$TEMP_DIR/$PKGNAME\" \"$BUILT_PRODUCTS_DIR/\"\n\n# for convenience\nmv \"$TEMP_DIR/$PKGNAME\" \"$SRCROOT/\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -367,6 +367,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application: Mischa Spiegelmock (5926VBQM6Y)"; COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; + DEVELOPMENT_TEAM = 5926VBQM6Y; DYLIB_CURRENT_VERSION = 1.0.0; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -392,6 +393,7 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks/"; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; + OTHER_CODE_SIGN_FLAGS = "--timestamp"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ""; SDKROOT = macosx; @@ -428,6 +430,7 @@ COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_LOCATION = YES; + DEVELOPMENT_TEAM = 5926VBQM6Y; DYLIB_CURRENT_VERSION = 1.0.0; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; @@ -446,6 +449,7 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks/"; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; + OTHER_CODE_SIGN_FLAGS = "--timestamp"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ""; SDKROOT = macosx; @@ -457,10 +461,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 5926VBQM6Y; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/macos/contrib", @@ -491,7 +492,6 @@ MARKETING_VERSION = 2.5; PRODUCT_BUNDLE_IDENTIFIER = "net.projectm.music-plugin"; PRODUCT_NAME = ProjectM; - PROVISIONING_PROFILE_SPECIFIER = ""; WRAPPER_EXTENSION = bundle; }; name = Debug; @@ -500,10 +500,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 5926VBQM6Y; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/macos/contrib", @@ -534,7 +531,6 @@ MARKETING_VERSION = 2.5; PRODUCT_BUNDLE_IDENTIFIER = "net.projectm.music-plugin"; PRODUCT_NAME = ProjectM; - PROVISIONING_PROFILE_SPECIFIER = ""; WRAPPER_EXTENSION = bundle; }; name = Release; diff --git a/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj b/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj index 47d1f60f5..01da7847a 100644 --- a/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj +++ b/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj @@ -400,7 +400,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "ls \"$CONFIGURATION_BUILD_DIR\"\nPKGNAME=ProjectM-SDL.pkg\n\nset -euxo pipefail\n\nmkdir -p \"$DSTROOT/Applications\" \"$DERIVED_FILE_DIR\"\ncp -rp \"$CONFIGURATION_BUILD_DIR/ProjectM.app\" \"$DSTROOT/Applications\"\n\necho \"DSTROOT: $DSTROOT/Applications\"\nls \"$DSTROOT/Applications\"\n\npkgbuild --component-plist \"$SRCROOT/projectMSDL-pkg.plist\" --root \"$DSTROOT\" \"$TEMP_DIR/$PKGNAME\"\n#pkgbuild --timestamp --sign '5926VBQM6Y' --component-plist \"$SRCROOT/projectMSDL-pkg.plist\" --root \"$DSTROOT\" \"$BUILT_PRODUCTS_DIR/$PKGNAME\"\n\necho \"Created installer package $TEMP_DIR/$PKGNAME\"\n\n# for combined installer\ncp \"$TEMP_DIR/$PKGNAME\" \"$BUILT_PRODUCTS_DIR/\"\n\n# for convenience\nmv \"$TEMP_DIR/$PKGNAME\" \"$SRCROOT/\"\n"; + shellScript = "ls \"$CONFIGURATION_BUILD_DIR\"\nPKGNAME=ProjectM-SDL.pkg\n\nset -euxo pipefail\n\nmkdir -p \"$DSTROOT/Applications\" \"$DERIVED_FILE_DIR\"\ncp -rp \"$CONFIGURATION_BUILD_DIR/ProjectM.app\" \"$DSTROOT/Applications\"\n\necho \"DSTROOT: $DSTROOT/Applications\"\nls \"$DSTROOT/Applications\"\n\n#pkgbuild --component-plist \"$SRCROOT/projectMSDL-pkg.plist\" --root \"$DSTROOT\" \"$TEMP_DIR/$PKGNAME\"\npkgbuild --timestamp --sign '5926VBQM6Y' --component-plist \"$SRCROOT/projectMSDL-pkg.plist\" --root \"$DSTROOT\" \"$TEMP_DIR/$PKGNAME\"\n\necho \"Created installer package $TEMP_DIR/$PKGNAME\"\n\n# for combined installer\ncp \"$TEMP_DIR/$PKGNAME\" \"$BUILT_PRODUCTS_DIR/\"\n\n# for convenience\nmv \"$TEMP_DIR/$PKGNAME\" \"$SRCROOT/\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -450,19 +450,15 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 5926VBQM6Y; GCC_UNROLL_LOOPS = YES; INFOPLIST_FILE = "projectM-SDL/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; - MARKETING_VERSION = 3.1.11; + MARKETING_VERSION = 3.1.12; OTHER_CFLAGS = "-DDATADIR_PATH='\"/usr/local/share/projectM\"'"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = net.projectm.sdl; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; SKIP_INSTALL = YES; WRAPPER_EXTENSION = app; @@ -473,20 +469,16 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 5926VBQM6Y; GCC_OPTIMIZATION_LEVEL = fast; GCC_UNROLL_LOOPS = YES; INFOPLIST_FILE = "projectM-SDL/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; - MARKETING_VERSION = 3.1.11; + MARKETING_VERSION = 3.1.12; OTHER_CFLAGS = "-DDATADIR_PATH='\"/usr/local/share/projectM\"'"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = net.projectm.sdl; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; SKIP_INSTALL = YES; WRAPPER_EXTENSION = app; @@ -515,7 +507,9 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_ENTITLEMENTS = SDLprojectM.entitlements; + CODE_SIGN_IDENTITY = "Developer ID Application: Mischa Spiegelmock (5926VBQM6Y)"; + DEVELOPMENT_TEAM = 5926VBQM6Y; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -543,6 +537,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-DDATADIR_PATH='\"/usr/local/share/projectM\"'"; + OTHER_CODE_SIGN_FLAGS = "--timestamp"; OTHER_LDFLAGS = "-lSDL2"; }; name = Debug; @@ -569,7 +564,9 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_ENTITLEMENTS = SDLprojectM.entitlements; + CODE_SIGN_IDENTITY = "Developer ID Application: Mischa Spiegelmock (5926VBQM6Y)"; + DEVELOPMENT_TEAM = 5926VBQM6Y; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -591,6 +588,7 @@ MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-DDATADIR_PATH='\"/usr/local/share/projectM\"'"; + OTHER_CODE_SIGN_FLAGS = "--timestamp"; OTHER_LDFLAGS = "-lSDL2"; }; name = Release; @@ -599,17 +597,11 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_ENTITLEMENTS = SDLprojectM.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 5926VBQM6Y; - ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "$(SRCROOT)/projectM-SDL/Info.plist"; LIBRARY_SEARCH_PATHS = /usr/local/lib; MARKETING_VERSION = 3.1.11; PRODUCT_BUNDLE_IDENTIFIER = net.projectm.sdl; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SYMROOT = "$(SRCROOT)/build"; }; name = Debug; @@ -618,17 +610,11 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_ENTITLEMENTS = SDLprojectM.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 5926VBQM6Y; - ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "$(SRCROOT)/projectM-SDL/Info.plist"; LIBRARY_SEARCH_PATHS = /usr/local/lib; MARKETING_VERSION = 3.1.11; PRODUCT_BUNDLE_IDENTIFIER = net.projectm.sdl; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SYMROOT = "$(SRCROOT)/build"; }; name = Release; diff --git a/src/projectM-sdl/SDLprojectM.xcodeproj/xcshareddata/xcschemes/SDLprojectM Binary Release.xcscheme b/src/projectM-sdl/SDLprojectM.xcodeproj/xcshareddata/xcschemes/SDLprojectM Binary Release.xcscheme new file mode 100644 index 000000000..4b465e259 --- /dev/null +++ b/src/projectM-sdl/SDLprojectM.xcodeproj/xcshareddata/xcschemes/SDLprojectM Binary Release.xcscheme @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/projectM-sdl/pmSDL.cpp b/src/projectM-sdl/pmSDL.cpp index 46e81f42c..1b638bd19 100644 --- a/src/projectM-sdl/pmSDL.cpp +++ b/src/projectM-sdl/pmSDL.cpp @@ -107,7 +107,7 @@ int projectMSDL::toggleAudioInput() { } int projectMSDL::initAudioInput() { - + // params for audio input SDL_AudioSpec want, have; @@ -142,7 +142,7 @@ int projectMSDL::initAudioInput() { audioSampleCount = have.samples; audioFormat = have.format; audioInputDevice = audioDeviceID; - + return 1; } @@ -153,7 +153,7 @@ int projectMSDL::openAudioInput() { const char* driver_name = SDL_GetCurrentAudioDriver(); SDL_Log("Using audio driver: %s\n", driver_name); #endif - + // get audio input device NumAudioDevices = SDL_GetNumAudioDevices(true); // capture, please @@ -169,11 +169,11 @@ int projectMSDL::openAudioInput() { SDL_Log("Found audio capture device %d: %s", i, SDL_GetAudioDeviceName(i, true)); } #endif - + // default selected Audio Device to 0. selectedAudioDevice = 0; initAudioInput(); - + return 1; } @@ -251,7 +251,7 @@ void projectMSDL::nextMonitor() std::vector displayBounds; int nextWindow = currentWindowIndex + 1; if (nextWindow >= displayCount) nextWindow = 0; - + for (int i = 0; i < displayCount; i++) { displayBounds.push_back(SDL_Rect()); @@ -320,7 +320,7 @@ void projectMSDL::keyHandler(SDL_Event *sdl_evt) { } break; case SDLK_ESCAPE: - if (projectM::isTextInputActive()) + if (projectM::isTextInputActive()) SDL_StopTextInput(); break; case SDLK_i: @@ -443,7 +443,7 @@ void projectMSDL::resize(unsigned int width_, unsigned int height_) { void projectMSDL::pollEvent() { SDL_Event evt; - + int mousex = 0; float mousexscale = 0; int mousey = 0; @@ -528,12 +528,12 @@ void projectMSDL::pollEvent() { // Scale those coordinates. libProjectM supports a scale of 0.1 instead of absolute pixel coordinates. mousexscale = (mousex / (float)width); mouseyscale = ((height - mousey) / (float)height); - // Drag Touch. + // Drag Touch. touchDrag(mousexscale, mouseyscale, mousepressure); } } -// This touches the screen to generate a waveform at X / Y. +// This touches the screen to generate a waveform at X / Y. void projectMSDL::touch(float x, float y, int pressure, int touchtype) { #ifdef PROJECTM_TOUCH_ENABLED projectM::touch(x, y, pressure, touchtype); @@ -695,7 +695,7 @@ void projectMSDL::renderTexture() { void projectMSDL::presetSwitchedEvent(bool isHardCut, size_t index) const { std::string presetName = getPresetName(index); SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Displaying preset: %s\n", presetName.c_str()); - + std::string newTitle = "projectM ➫ " + presetName; SDL_SetWindowTitle(win, newTitle.c_str()); } diff --git a/src/projectM-sdl/projectM-SDL/Info.plist b/src/projectM-sdl/projectM-SDL/Info.plist index 1635c34e0..9ad0da9cc 100644 --- a/src/projectM-sdl/projectM-SDL/Info.plist +++ b/src/projectM-sdl/projectM-SDL/Info.plist @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - projectM SDL.app + ProjectM.app CFBundlePackageType BNDL CFBundleShortVersionString diff --git a/src/projectM-test/projectM-test.cpp b/src/projectM-test/projectM-test.cpp index 27aef19b7..451da0f79 100644 --- a/src/projectM-test/projectM-test.cpp +++ b/src/projectM-test/projectM-test.cpp @@ -24,15 +24,8 @@ #include "sdltoprojectM.h" #include "ConfigFile.h" #include "getConfigFilename.h" +#include "projectM-opengl.h" #include - -#ifdef __unix__ -#include -#endif -#ifdef __APPLE__ -#include -#endif - #include projectM *globalPM= NULL;