GLM Preprocessor Definitions to Project (#8352)

NickHardeman · web-flow · commit 791e812c7719 · 2025-03-07T16:37:25.000-08:00
* wrapping glm defines in if statements to avoid re-definition using project preprocessor definitions.

* Adding glm defines to Xcode project.

* make file glm project defines.

* vs project defines for glm.

* vs2019 glm project defines.

* ios core config glm defines.

* macOS glm defines.
diff --git a/libs/openFrameworks/3d/ofEasyCam.cpp b/libs/openFrameworks/3d/ofEasyCam.cpp
@@ -2,8 +2,12 @@
 #include "ofUtils.h"
 #include "ofGraphicsBaseTypes.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/gtx/vector_angle.hpp>
 #include <limits>
 
diff --git a/libs/openFrameworks/3d/ofEasyCam.h b/libs/openFrameworks/3d/ofEasyCam.h
@@ -5,8 +5,12 @@ class ofEventListeners;
 class ofEventArgs;
 class ofRectangle;
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/gtc/quaternion.hpp>
 
 /// \brief A super simple camera for interacting with objects in 3D space.
diff --git a/libs/openFrameworks/3d/ofNode.cpp b/libs/openFrameworks/3d/ofNode.cpp
@@ -2,8 +2,12 @@
 #include "ofNode.h"
 #include "of3dGraphics.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/mat4x4.hpp>
 #include "ofVectorMath.h"
 
diff --git a/libs/openFrameworks/app/ofWindowSettings.h b/libs/openFrameworks/app/ofWindowSettings.h
@@ -1,7 +1,11 @@
 #pragma once
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/vec2.hpp>
 
 #include <string>
diff --git a/libs/openFrameworks/events/ofEvents.h b/libs/openFrameworks/events/ofEvents.h
@@ -5,8 +5,12 @@
 #include "ofTimerFps.h"
 #include "ofConstants.h" // FS Only
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/vec2.hpp>
 
 #include <set>
diff --git a/libs/openFrameworks/gl/ofCubeMap.cpp b/libs/openFrameworks/gl/ofCubeMap.cpp
@@ -20,8 +20,12 @@
 #include "ofAppAndroidWindow.h"
 #endif
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/gtx/transform.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <map>
diff --git a/libs/openFrameworks/gl/ofCubeMap.h b/libs/openFrameworks/gl/ofCubeMap.h
@@ -8,8 +8,12 @@
 
 #include "ofShader.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/mat4x4.hpp>
 
 class ofVboMesh;
diff --git a/libs/openFrameworks/gl/ofLight.cpp b/libs/openFrameworks/gl/ofLight.cpp
@@ -15,8 +15,12 @@
 #include "ofGLUtils.h"
 #include "ofColor.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/gtc/quaternion.hpp>
 
 #include <map>
diff --git a/libs/openFrameworks/gl/ofMaterial.cpp b/libs/openFrameworks/gl/ofMaterial.cpp
@@ -5,8 +5,12 @@
 #include "ofImage.h"
 #include "ofGLProgrammableRenderer.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/vec2.hpp>
 #include <glm/gtx/transform.hpp>
 
diff --git a/libs/openFrameworks/gl/ofMaterial.h b/libs/openFrameworks/gl/ofMaterial.h
@@ -3,8 +3,12 @@
 #include "ofMaterialBaseTypes.h"
 #include "ofShader.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/fwd.hpp>
 #include <glm/vec2.hpp>
 #include <glm/mat4x4.hpp>
diff --git a/libs/openFrameworks/gl/ofShadow.cpp b/libs/openFrameworks/gl/ofShadow.cpp
@@ -14,8 +14,12 @@
 // MARK: ofConstants Targets
 #include "ofConstants.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/gtx/transform.hpp>
 #include <glm/gtc/quaternion.hpp>
 
diff --git a/libs/openFrameworks/gl/ofTexture.h b/libs/openFrameworks/gl/ofTexture.h
@@ -4,8 +4,12 @@
 // MARK: Targets, some can be moved to cpp, GLEW also
 #include "ofConstants.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/mat4x4.hpp>
 #include "ofGLUtils.h"
 
diff --git a/libs/openFrameworks/graphics/ofGraphicsBaseTypes.cpp b/libs/openFrameworks/graphics/ofGraphicsBaseTypes.cpp
@@ -1,8 +1,12 @@
 #include "ofGraphicsBaseTypes.h"
 #include "ofRectangle.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/vec2.hpp>
 #include <glm/trigonometric.hpp>
 
diff --git a/libs/openFrameworks/graphics/ofGraphicsBaseTypes.h b/libs/openFrameworks/graphics/ofGraphicsBaseTypes.h
@@ -49,8 +49,12 @@ struct ofBoundingBox{
 	glm::vec3 max { 0, 0, 0 };
 };
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/mat4x4.hpp>
 
 /// \brief Contains general information about the style of ofGraphics
diff --git a/libs/openFrameworks/math/ofMatrix3x3.h b/libs/openFrameworks/math/ofMatrix3x3.h
@@ -5,8 +5,12 @@
 
 #pragma once
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/mat3x3.hpp>
 
 #include <iostream>
diff --git a/libs/openFrameworks/math/ofMatrix4x4.h b/libs/openFrameworks/math/ofMatrix4x4.h
@@ -13,8 +13,12 @@
 #include "ofVec4f.h"
 #include "ofQuaternion.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/mat4x4.hpp>
 
 class ofVec3f;
diff --git a/libs/openFrameworks/math/ofQuaternion.cpp b/libs/openFrameworks/math/ofQuaternion.cpp
@@ -1,8 +1,12 @@
 #include "ofQuaternion.h"
 #include "ofMatrix4x4.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/gtc/quaternion.hpp>
 
 //----------------------------------------
diff --git a/libs/openFrameworks/math/ofVec2f.h b/libs/openFrameworks/math/ofVec2f.h
@@ -2,8 +2,12 @@
 
 #include <iostream>
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 
 #include <glm/vec2.hpp>
 #include <glm/fwd.hpp>
diff --git a/libs/openFrameworks/math/ofVec3f.h b/libs/openFrameworks/math/ofVec3f.h
@@ -3,8 +3,12 @@
 #include "ofVec2f.h"
 #include "ofVec4f.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/vec3.hpp>
 
 /// \brief  ofVec3f is a class for storing a three dimensional vector.
diff --git a/libs/openFrameworks/math/ofVec4f.cpp b/libs/openFrameworks/math/ofVec4f.cpp
@@ -2,8 +2,12 @@
 #include "ofVec3f.h"
 #include "ofVec4f.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
 
diff --git a/libs/openFrameworks/math/ofVectorMath.h b/libs/openFrameworks/math/ofVectorMath.h
@@ -4,8 +4,12 @@ class ofMatrix3x3;
 #include "ofMatrix4x4.h"
 #include "ofQuaternion.h"
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>
diff --git a/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp b/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp
@@ -2,7 +2,9 @@
 
 #ifdef OF_SOUND_PLAYER_OPENAL
 
-#define GLM_FORCE_CTOR_INIT
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
 #include <glm/gtc/constants.hpp>
 #include <glm/ext/scalar_common.hpp>
 
diff --git a/libs/openFrameworks/sound/ofSoundBuffer.cpp b/libs/openFrameworks/sound/ofSoundBuffer.cpp
@@ -9,8 +9,12 @@
 #include "ofSoundUtils.h"
 #include "ofLog.h"
 #include "ofMath.h"
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/trigonometric.hpp>
 #include <limits>
 
diff --git a/libs/openFrameworks/sound/ofSoundPlayer.cpp b/libs/openFrameworks/sound/ofSoundPlayer.cpp
@@ -1,7 +1,11 @@
 #include "ofSoundPlayer.h"
 #include "ofLog.h"
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/ext/scalar_common.hpp>
 
 #ifdef OF_SOUND_PLAYER_AV_ENGINE
diff --git a/libs/openFrameworks/sound/ofSoundUtils.h b/libs/openFrameworks/sound/ofSoundUtils.h
@@ -7,8 +7,12 @@
 
 #pragma once
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/gtc/constants.hpp>
 #include <glm/ext/scalar_common.hpp>
 
diff --git a/libs/openFrameworks/types/ofColor.h b/libs/openFrameworks/types/ofColor.h
@@ -1,7 +1,11 @@
 #pragma once
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/ext/scalar_common.hpp>
 #include <glm/vec3.hpp>
 #include <iostream>
diff --git a/libs/openFrameworks/types/ofRectangle.h b/libs/openFrameworks/types/ofRectangle.h
@@ -1,7 +1,11 @@
 #pragma once
 
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
+#if !defined(GLM_FORCE_CTOR_INIT)
+	#define GLM_FORCE_CTOR_INIT
+#endif
+#if !defined(GLM_ENABLE_EXPERIMENTAL)
+	#define GLM_ENABLE_EXPERIMENTAL
+#endif
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
 #include <iostream>
diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h
diff --git a/libs/openFrameworks/utils/ofMatrixStack.cpp b/libs/openFrameworks/utils/ofMatrixStack.cpp
diff --git a/libs/openFrameworks/utils/ofMatrixStack.h b/libs/openFrameworks/utils/ofMatrixStack.h
diff --git a/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/ios/CoreOF.xcconfig
diff --git a/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/macos/CoreOF.xcconfig
diff --git a/libs/openFrameworksCompiled/project/makefileCommon/config.project.mk b/libs/openFrameworksCompiled/project/makefileCommon/config.project.mk
diff --git a/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig b/libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig
diff --git a/libs/openFrameworksCompiled/project/vs/openFrameworksDebug.props b/libs/openFrameworksCompiled/project/vs/openFrameworksDebug.props
diff --git a/libs/openFrameworksCompiled/project/vs/openFrameworksRelease.props b/libs/openFrameworksCompiled/project/vs/openFrameworksRelease.props
diff --git a/libs/openFrameworksCompiled/project/vs/openframeworksLib.vcxproj b/libs/openFrameworksCompiled/project/vs/openframeworksLib.vcxproj
diff --git a/libs/openFrameworksCompiled/project/vs2019/openFrameworksDebug.props b/libs/openFrameworksCompiled/project/vs2019/openFrameworksDebug.props
diff --git a/libs/openFrameworksCompiled/project/vs2019/openFrameworksRelease.props b/libs/openFrameworksCompiled/project/vs2019/openFrameworksRelease.props
diff --git a/libs/openFrameworksCompiled/project/vs2019/openframeworksLib.vcxproj b/libs/openFrameworksCompiled/project/vs2019/openframeworksLib.vcxproj
