Skip to content

Commit

Permalink
projectGenerator macOS fixes. Update
Browse files Browse the repository at this point in the history
  • Loading branch information
danoli3 committed Jun 25, 2024
1 parent 567076f commit 9db2e2a
Show file tree
Hide file tree
Showing 8 changed files with 160 additions and 170 deletions.
2 changes: 1 addition & 1 deletion commandLine/App.xcconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OF_NO_FMOD = 1
OF_CORE_LIBS = $(LIB_GLEW) $(LIB_PUGIXML)
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_GLEW) $(HEADER_TESS2) $(HEADER_GLFW) $(HEADER_UTF8) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_PUGIXML)
OF_CORE_FRAMEWORKS = -framework Accelerate -framework Cocoa -framework CoreFoundation -framework CoreServices -framework CoreVideo -framework IOKit -framework OpenGL -framework QuartzCore -framework Security
OF_CORE_FRAMEWORKS = -framework Accelerate -framework Cocoa -framework CoreFoundation -framework CoreServices -framework CoreVideo -framework IOKit -framework OpenGL -framework QuartzCore -framework Security -framework AVFAudio -framework Foundation -framework SystemConfiguration
255 changes: 115 additions & 140 deletions commandLine/commandLine.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
LastUpgradeVersion = "1540"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 3 additions & 0 deletions commandLine/config.make
Original file line number Diff line number Diff line change
Expand Up @@ -180,3 +180,6 @@ PLATFORM_CORE_EXCLUSIONS += ../../../libs/rtAudio%
# inside ofImage inside ofUtils
#PLATFORM_CORE_EXCLUSIONS += ../../../libs/uriparser%

# Uncomment/comment below to switch between C++11 and C++17 ( or newer ). On macOS C++17 needs 10.15 or above.
export MAC_OS_MIN_VERSION = 10.15
export MAC_OS_CPP_VER = -std=c++17
18 changes: 8 additions & 10 deletions commandLine/openFrameworks-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,30 @@
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<string>${DEVELOPMENT_LANGUAGE}</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>$(ICON_NAME)</string>
<string>${ICON_NAME}</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(TARGET_NAME)</string>
<string>${TARGET_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<string>${MARKETING_VERSION}</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.graphics-design</string>
<string>${CURRENT_PROJECT_VERSION}</string>
<key>NSCameraUsageDescription</key>
<string>This app needs to access the camera</string>
<key>NSMicrophoneUsageDescription</key>
<string>This app needs to access the microphone</string>
<key>NSHighResolutionCapable</key>
<false/>
<string>${HIGH_RESOLUTION_CAPABLE}</string>
</dict>
</plist>
42 changes: 26 additions & 16 deletions frontend/npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion scripts/osx/build_frontend.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ SOURCE_FILE="${PG_DIR}/commandLine/bin/projectGenerator"
DESTINATION_PATH="app"
echo "SOURCE_FILE:$SOURCE_FILE";

if [ ! -f "$SOURCE_FILE" ]; then
SOURCE_FILE="${PG_DIR}/commandLine/bin/commandLine.app/contents/MacOS/commandLine"
fi


# Check if the source file exists
if [ -f "$SOURCE_FILE" ]; then
Expand All @@ -42,7 +46,7 @@ if [ -f "$SOURCE_FILE" ]; then
rm -f "${DESTINATION_PATH}/projectGenerator"
fi
mkdir -p "$DESTINATION_PATH" # Create destination directory if it doesn't exist
cp -X "$SOURCE_FILE" "$DESTINATION_PATH/"
cp -X "$SOURCE_FILE" "$DESTINATION_PATH/projectGenerator"
echo "File copied successfully."
else
# File does not exist
Expand Down

0 comments on commit 9db2e2a

Please sign in to comment.