Created
November 19, 2013 01:11
-
-
Save pizthewiz/7538466 to your computer and use it in GitHub Desktop.
A project created by the projectGenerator in oF v0.8.0 uses an Xcode config file to define OF_PATH but the internal project file still contains several hardcoded references to the expected historical value of OF_PATH "../../..". A few that are fixable with the diff below are [1] the Copy Files build phase for the FMOD dylib [2] the definition of…
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Project.xcconfig b/Project.xcconfig | |
index c90f7b1..6f6232a 100644 | |
--- a/Project.xcconfig | |
+++ b/Project.xcconfig | |
@@ -13,5 +13,5 @@ ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/ | |
//IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to: | |
//ICON_FILE_PATH = bin/data/ | |
-OTHER_LDFLAGS = $(OF_CORE_LIBS) | |
+OTHER_LDFLAGS = $(OF_CORE_LIBS) -framework GLUT | |
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) | |
diff --git a/Slideshow.xcodeproj/project.pbxproj b/Slideshow.xcodeproj/project.pbxproj | |
index eb8de12..22fc9ce 100644 | |
--- a/Slideshow.xcodeproj/project.pbxproj | |
+++ b/Slideshow.xcodeproj/project.pbxproj | |
@@ -7,7 +7,6 @@ | |
objects = { | |
/* Begin PBXBuildFile section */ | |
- BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; | |
E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; }; | |
E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; }; | |
E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */; }; | |
@@ -23,7 +22,6 @@ | |
E4C2424710CC5A17004149E2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424410CC5A17004149E2 /* AppKit.framework */; }; | |
E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; }; | |
E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; }; | |
- E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; }; | |
E7E077E515D3B63C0020DFD4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E415D3B63C0020DFD4 /* CoreVideo.framework */; }; | |
E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E077E715D3B6510020DFD4 /* QTKit.framework */; }; | |
E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7F985F515E0DE99003869B5 /* Accelerate.framework */; }; | |
@@ -46,21 +44,7 @@ | |
}; | |
/* End PBXContainerItemProxy section */ | |
-/* Begin PBXCopyFilesBuildPhase section */ | |
- E4C2427710CC5ABF004149E2 /* CopyFiles */ = { | |
- isa = PBXCopyFilesBuildPhase; | |
- buildActionMask = 2147483647; | |
- dstPath = ""; | |
- dstSubfolderSpec = 10; | |
- files = ( | |
- BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */, | |
- ); | |
- runOnlyForDeploymentPostprocessing = 0; | |
- }; | |
-/* End PBXCopyFilesBuildPhase section */ | |
- | |
/* Begin PBXFileReference section */ | |
- BBAB23BE13894E4700AA2426 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = ../../../libs/glut/lib/osx/GLUT.framework; sourceTree = "<group>"; }; | |
E4328143138ABC890047C5CB /* openFrameworksLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = openFrameworksLib.xcodeproj; path = ../../../libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj; sourceTree = SOURCE_ROOT; }; | |
E45BE9710E8CC7DD009D7055 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; }; | |
E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; }; | |
@@ -93,7 +77,6 @@ | |
files = ( | |
E7F985F815E0DEA3003869B5 /* Accelerate.framework in Frameworks */, | |
E7E077E815D3B6510020DFD4 /* QTKit.framework in Frameworks */, | |
- E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */, | |
E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */, | |
E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */, | |
E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */, | |
@@ -143,14 +126,6 @@ | |
name = "system frameworks"; | |
sourceTree = "<group>"; | |
}; | |
- BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */ = { | |
- isa = PBXGroup; | |
- children = ( | |
- BBAB23BE13894E4700AA2426 /* GLUT.framework */, | |
- ); | |
- name = "3rd party frameworks"; | |
- sourceTree = "<group>"; | |
- }; | |
E4328144138ABC890047C5CB /* Products */ = { | |
isa = PBXGroup; | |
children = ( | |
@@ -162,7 +137,6 @@ | |
E45BE5980E8CC70C009D7055 /* frameworks */ = { | |
isa = PBXGroup; | |
children = ( | |
- BBAB23CA13894EDB00AA2426 /* 3rd party frameworks */, | |
BBAB23C913894ECA00AA2426 /* system frameworks */, | |
); | |
name = frameworks; | |
@@ -210,7 +184,6 @@ | |
E4B69B580A3A1756003C02F2 /* Sources */, | |
E4B69B590A3A1756003C02F2 /* Frameworks */, | |
E4B6FFFD0C3F9AB9008CF71C /* ShellScript */, | |
- E4C2427710CC5ABF004149E2 /* CopyFiles */, | |
); | |
buildRules = ( | |
); | |
@@ -278,7 +251,7 @@ | |
); | |
runOnlyForDeploymentPostprocessing = 0; | |
shellPath = /bin/sh; | |
- shellScript = "cp -f ../../../libs/fmodex/lib/osx/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/libfmodex.dylib\"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\nmkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\ncp -f \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n"; | |
+ shellScript = "cp -f \"$OF_PATH/libs/fmodex/lib/osx/libfmodex.dylib\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/libfmodex.dylib\"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\n\nmkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\ncp -f \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/\"\nditto \"$OF_PATH/libs/glut/lib/osx/GLUT.framework\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/GLUT.framework\"\n"; | |
}; | |
/* End PBXShellScriptBuildPhase section */ | |
@@ -373,7 +346,7 @@ | |
"$(inherited)", | |
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", | |
); | |
- FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; | |
+ FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(OF_PATH)/libs/glut/lib/osx\""; | |
GCC_DYNAMIC_NO_PIC = NO; | |
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; | |
GCC_MODEL_TUNING = NONE; | |
@@ -460,7 +433,7 @@ | |
"$(inherited)", | |
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", | |
); | |
- FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../libs/glut/lib/osx\""; | |
+ FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(OF_PATH)/libs/glut/lib/osx\""; | |
GCC_GENERATE_DEBUGGING_SYMBOLS = YES; | |
GCC_MODEL_TUNING = NONE; | |
ICON = "$(ICON_NAME_RELEASE)"; |
If one doesn't need to clean/rebuild the actual oF Xcode project (the average use case), the subproject could be removed as well and poof, no more hardcoded references!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Actually, the
CoreOF.xcconfig
reference can be removed since there isn't any functional need for it and the oF Xcode project makes it browsable within the UI if needed - 4 of 5.