Skip to content

Commit 9db2e2a

Browse files
committed
projectGenerator macOS fixes. Update
1 parent 567076f commit 9db2e2a

File tree

8 files changed

+160
-170
lines changed

8 files changed

+160
-170
lines changed

commandLine/App.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
OF_NO_FMOD = 1
22
OF_CORE_LIBS = $(LIB_GLEW) $(LIB_PUGIXML)
33
OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_GLEW) $(HEADER_TESS2) $(HEADER_GLFW) $(HEADER_UTF8) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_PUGIXML)
4-
OF_CORE_FRAMEWORKS = -framework Accelerate -framework Cocoa -framework CoreFoundation -framework CoreServices -framework CoreVideo -framework IOKit -framework OpenGL -framework QuartzCore -framework Security
4+
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

commandLine/commandLine.xcodeproj/project.pbxproj

+115-140
Large diffs are not rendered by default.

commandLine/commandLine.xcodeproj/xcshareddata/xcschemes/commandLine Debug.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0600"
3+
LastUpgradeVersion = "1540"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

commandLine/commandLine.xcodeproj/xcshareddata/xcschemes/commandLine Release.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0600"
3+
LastUpgradeVersion = "1540"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

commandLine/config.make

+3
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,6 @@ PLATFORM_CORE_EXCLUSIONS += ../../../libs/rtAudio%
180180
# inside ofImage inside ofUtils
181181
#PLATFORM_CORE_EXCLUSIONS += ../../../libs/uriparser%
182182

183+
# Uncomment/comment below to switch between C++11 and C++17 ( or newer ). On macOS C++17 needs 10.15 or above.
184+
export MAC_OS_MIN_VERSION = 10.15
185+
export MAC_OS_CPP_VER = -std=c++17

commandLine/openFrameworks-Info.plist

+8-10
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,30 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>$(DEVELOPMENT_LANGUAGE)</string>
6+
<string>${DEVELOPMENT_LANGUAGE}</string>
77
<key>CFBundleExecutable</key>
8-
<string>$(EXECUTABLE_NAME)</string>
8+
<string>${EXECUTABLE_NAME}</string>
99
<key>CFBundleIconFile</key>
10-
<string>$(ICON_NAME)</string>
10+
<string>${ICON_NAME}</string>
1111
<key>CFBundleIdentifier</key>
12-
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
12+
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>
16-
<string>$(TARGET_NAME)</string>
16+
<string>${TARGET_NAME}</string>
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>$(MARKETING_VERSION)</string>
22+
<string>${MARKETING_VERSION}</string>
2323
<key>CFBundleVersion</key>
24-
<string>$(CURRENT_PROJECT_VERSION)</string>
25-
<key>LSApplicationCategoryType</key>
26-
<string>public.app-category.graphics-design</string>
24+
<string>${CURRENT_PROJECT_VERSION}</string>
2725
<key>NSCameraUsageDescription</key>
2826
<string>This app needs to access the camera</string>
2927
<key>NSMicrophoneUsageDescription</key>
3028
<string>This app needs to access the microphone</string>
3129
<key>NSHighResolutionCapable</key>
32-
<false/>
30+
<string>${HIGH_RESOLUTION_CAPABLE}</string>
3331
</dict>
3432
</plist>

frontend/npm-shrinkwrap.json

+26-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/osx/build_frontend.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ SOURCE_FILE="${PG_DIR}/commandLine/bin/projectGenerator"
3232
DESTINATION_PATH="app"
3333
echo "SOURCE_FILE:$SOURCE_FILE";
3434

35+
if [ ! -f "$SOURCE_FILE" ]; then
36+
SOURCE_FILE="${PG_DIR}/commandLine/bin/commandLine.app/contents/MacOS/commandLine"
37+
fi
38+
3539

3640
# Check if the source file exists
3741
if [ -f "$SOURCE_FILE" ]; then
@@ -42,7 +46,7 @@ if [ -f "$SOURCE_FILE" ]; then
4246
rm -f "${DESTINATION_PATH}/projectGenerator"
4347
fi
4448
mkdir -p "$DESTINATION_PATH" # Create destination directory if it doesn't exist
45-
cp -X "$SOURCE_FILE" "$DESTINATION_PATH/"
49+
cp -X "$SOURCE_FILE" "$DESTINATION_PATH/projectGenerator"
4650
echo "File copied successfully."
4751
else
4852
# File does not exist

0 commit comments

Comments
 (0)