Skip to content

Commit da125a0

Browse files
authored
[wip] macOS tidy up before release (#8406)
* macOS tidy up before release * ofTimerFps changes
1 parent 1c2a586 commit da125a0

File tree

7 files changed

+9
-13
lines changed

7 files changed

+9
-13
lines changed

addons/ofxAssimpModelLoader/src/ofxAssimpMeshHelper.h

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
#include "ofxAssimpTexture.h"
1313
#include "ofVbo.h"
1414
#include "ofMesh.h"
15-
#define GLM_FORCE_CTOR_INIT
16-
#define GLM_ENABLE_EXPERIMENTAL
1715
#include "glm/mat4x4.hpp"
1816

1917
struct aiMesh;

libs/openFrameworks/3d/ofNode.h

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
#pragma once
33

44
#include "ofParameter.h"
5-
6-
#define GLM_FORCE_CTOR_INIT
7-
#define GLM_ENABLE_EXPERIMENTAL
85
#include <glm/gtc/quaternion.hpp>
96

107
#include <array>

libs/openFrameworks/utils/ofTimerFps.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ void ofTimerFps::setFps(int fps) {
2424

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

2929
// Processor Coffee
3030
while(steady_clock::now() < (wakeTime)) { // 0.05ms 0.5us // - 0.5us - 1ns
31-
std::this_thread::yield();
31+
// std::this_thread::yield();
32+
std::this_thread::sleep_for(5us);
3233
}
3334

3435
lastWakeTime = wakeTime;

scripts/templates/osx/Project.xcconfig

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ OF_PATH = ../../..
88
//UNCOMMENT BELOW TO ENABLE C++ 17 and std::filesystem
99
CLANG_CXX_LANGUAGE_STANDARD = c++23
1010
CLANG_C_LANGUAGE_STANDARD = c17
11-
MACOSX_DEPLOYMENT_TARGET = 10.15
11+
MACOSX_DEPLOYMENT_TARGET = 11.5
1212

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

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

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

6666
HIGH_RESOLUTION_CAPABLE = NO
6767

68-
// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY.
68+
// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY.
6969
#include? "App.xcconfig"
7070

7171
//FOR AV ENGINE SOUND PLAYER UNCOMMENT THREE LINES BELOW

scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,4 @@
323323
},
324324
"objectVersion" : "54",
325325
"rootObject" : "E4B69B4C0A3A1720003C02F2"
326-
}
326+
}

0 commit comments

Comments
 (0)