Skip to content

Conversation

@danoli3
Copy link
Member

@danoli3 danoli3 commented Mar 4, 2025

@danoli3 danoli3 merged commit ffd1178 into openframeworks:master Mar 4, 2025
15 checks passed
@danoli3 danoli3 added the iOS label Mar 4, 2025
danoli3 added a commit that referenced this pull request Mar 13, 2025
* commit '5630d2034d835e81225a225355e97f4144b21179': (446 commits)
  Restore target build dir behavior for Xcode. Closes #8321 (#8340)
  of script updates (#8339)
  _OBJC_CLASS_$_AVFoundationVideoPlayer fix (#8337)
  poco mk (#8336)
  relative locations rabbit (#8335)
  fix(ofParameter): better default init() handling of non-comparable/non-copyable objects and containers (#8325)
  path to string conversion on Windows fix. (#8333)
  iOS template add ofxiOS group ref (#8330)
  Xcode iOS Target Project Fixes (#8328)
  chore(iOS): remove iosNativeARCExample (#8324)
  ofxGui fix for apple targets (#8320)
  assimp ios addon_config (#8319)
  chore(iOS): remove GLKit example (#8317)
  fix(iOS): adjustments to layout of Location example + deprecations updates (#8311)
  fix(iOS): update to CoreLocation authorization request (#8309)
  remove boost from android. (#8307)
  Remove boost from linux scripts, download_libs (#8306)
  ofPixels memory allocation size fix (#8226)
  remove boost references from CoreOF.xcconfig and config.*.default.mk for macOS and osx. (#8304)
  Fix to json scripts (#8301)
  ...

# Conflicts:
#	.gitignore
#	libs/openFrameworks/gl/ofGLProgrammableRenderer.cpp
#	libs/openFrameworks/gl/ofGLUtils.h
#	libs/openFrameworks/gl/ofShader.cpp
#	libs/openFrameworks/gl/ofTexture.h
#	libs/openFrameworks/graphics/ofTrueTypeFont.cpp
#	libs/openFrameworks/graphics/ofTrueTypeFont.h
#	libs/openFrameworks/sound/ofAVEngineSoundPlayer.h
#	libs/openFrameworks/sound/ofSoundBaseTypes.cpp
#	libs/openFrameworks/sound/ofSoundBaseTypes.h
#	libs/openFrameworks/sound/ofSoundStream.cpp
#	libs/openFrameworks/utils/ofConstants.h
#	libs/openFrameworks/utils/ofThread.h
#	libs/openFrameworks/utils/ofURLFileLoader.cpp
#	libs/openFrameworks/utils/ofUtils.h
#	libs/openFrameworks/utils/ofXml.h
#	libs/openFrameworksCompiled/project/android/build.gradle
#	libs/openFrameworksCompiled/project/android/common-functions.gradle
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

tessellation on polygonExamples broken for iPhone - tess2 issue?

1 participant