Skip to content

[wip] macOS tidy up before release #8406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ofTheo merged 2 commits into from
Mar 29, 2025
Merged

[wip] macOS tidy up before release #8406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ebe27f
macOS tidy up before release
dimitre Mar 28, 2025
73bedf3
ofTimerFps changes
dimitre Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions addons/ofxAssimpModelLoader/src/ofxAssimpMeshHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
#include "ofxAssimpTexture.h"
#include "ofVbo.h"
#include "ofMesh.h"
#define GLM_FORCE_CTOR_INIT
#define GLM_ENABLE_EXPERIMENTAL
#include "glm/mat4x4.hpp"

struct aiMesh;
Expand Down
2 changes: 1 addition & 1 deletion apps/projectGenerator
Open in desktop
Submodule projectGenerator updated 4 files
+1 −1 commandLine/src/defines.h
+2 −2 commandLine/src/main.cpp
+35 −13 commandLine/src/projects/xcodeProject.cpp
+0 −1 commandLine/src/projects/xcodeProject.h
3 changes: 0 additions & 3 deletions libs/openFrameworks/3d/ofNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
#pragma once

#include "ofParameter.h"

#define GLM_FORCE_CTOR_INIT
#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtc/quaternion.hpp>

#include <array>
Expand Down
5 changes: 3 additions & 2 deletions libs/openFrameworks/utils/ofTimerFps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ void ofTimerFps::setFps(int fps) {

void ofTimerFps::waitNext() {
// Lazy wakeup
std::this_thread::sleep_until(wakeTime - 36ms); //4ms
std::this_thread::sleep_until(wakeTime - 8ms); //4ms

// Processor Coffee
while(steady_clock::now() < (wakeTime)) { // 0.05ms 0.5us // - 0.5us - 1ns
std::this_thread::yield();
// std::this_thread::yield();
std::this_thread::sleep_for(5us);
}

lastWakeTime = wakeTime;
Expand Down
2 changes: 1 addition & 1 deletion scripts/apothecary
Open in desktop
Submodule apothecary updated 1 files
+1 −1 scripts/calculate_formulas.sh
6 changes: 3 additions & 3 deletions scripts/templates/osx/Project.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ OF_PATH = ../../..
//UNCOMMENT BELOW TO ENABLE C++ 17 and std::filesystem
CLANG_CXX_LANGUAGE_STANDARD = c++23
CLANG_C_LANGUAGE_STANDARD = c17
MACOSX_DEPLOYMENT_TARGET = 10.15
MACOSX_DEPLOYMENT_TARGET = 11.5

// App Settings
PRODUCT_NAME = $(TARGET_NAME)
Expand All @@ -30,7 +30,7 @@ INFOPLIST_KEY_LSApplicationCategoryType = public.app-category.games
// suggested to use semantic versioning format ala #.#.#
MARKETING_VERSION = 0.1.0

// If users upgrade project to recommended settings it enables script sandboxing which breaks our post build script
// If users upgrade project to recommended settings it enables script sandboxing which breaks our post build script
ENABLE_USER_SCRIPT_SANDBOXING=NO

// this is "Build" in the Xcode target Identity UI, an incremental build number
Expand Down Expand Up @@ -65,7 +65,7 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME)

HIGH_RESOLUTION_CAPABLE = NO

// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY.
// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY.
#include? "App.xcconfig"

//FOR AV ENGINE SOUND PLAYER UNCOMMENT THREE LINES BELOW
Expand Down
2 changes: 1 addition & 1 deletion scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,4 +323,4 @@
},
"objectVersion" : "54",
"rootObject" : "E4B69B4C0A3A1720003C02F2"
}
}