diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/English.lproj/InfoPlist.strings index 651a6a8..48e4b96 100644 Binary files a/macosx/English.lproj/InfoPlist.strings and b/macosx/English.lproj/InfoPlist.strings differ diff --git a/macosx/Info.plist b/macosx/Info.plist index 9fd77a9..8c85929 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleExecutable - Loki + loki CFBundleIconFile CFBundleIdentifier diff --git a/macosx/Loki.xcodeproj/project.pbxproj b/macosx/Loki.xcodeproj/project.pbxproj index e15465f..8a1f4cf 100644 --- a/macosx/Loki.xcodeproj/project.pbxproj +++ b/macosx/Loki.xcodeproj/project.pbxproj @@ -50,21 +50,6 @@ 8D07F2C40486CC7A007CD1D0 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - 4F0BB7EC011F40E904CA0E50 /* Debug */ = { - isa = PBXBuildStyle; - buildSettings = { - }; - name = Debug; - }; - 4F0BB7ED011F40E904CA0E50 /* Release */ = { - isa = PBXBuildStyle; - buildSettings = { - }; - name = Release; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 08FB77AAFE841565C02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; @@ -108,7 +93,7 @@ 18A7B81909E3306400F567CA /* TypeTraits.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TypeTraits.h; path = ../include/loki/TypeTraits.h; sourceTree = SOURCE_ROOT; }; 18A7B81A09E3306400F567CA /* Visitor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Visitor.h; path = ../include/loki/Visitor.h; sourceTree = SOURCE_ROOT; }; 8D07F2C70486CC7A007CD1D0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 8D07F2C80486CC7A007CD1D0 /* Loki.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Loki.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8D07F2C80486CC7A007CD1D0 /* loki.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = loki.framework; path = loki.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -126,7 +111,7 @@ 034768DDFF38A45A11DB9C8B /* Products */ = { isa = PBXGroup; children = ( - 8D07F2C80486CC7A007CD1D0 /* Loki.framework */, + 8D07F2C80486CC7A007CD1D0 /* loki.framework */, ); name = Products; sourceTree = ""; @@ -259,9 +244,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 8D07F2BC0486CC7A007CD1D0 /* Loki */ = { + 8D07F2BC0486CC7A007CD1D0 /* loki */ = { isa = PBXNativeTarget; - buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "Loki" */; + buildConfigurationList = 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "loki" */; buildPhases = ( 8D07F2BD0486CC7A007CD1D0 /* Headers */, 8D07F2BF0486CC7A007CD1D0 /* Resources */, @@ -271,14 +256,12 @@ ); buildRules = ( ); - buildSettings = { - }; dependencies = ( ); - name = Loki; + name = loki; productInstallPath = "$(HOME)/Library/Frameworks"; - productName = Loki; - productReference = 8D07F2C80486CC7A007CD1D0 /* Loki.framework */; + productName = loki; + productReference = 8D07F2C80486CC7A007CD1D0 /* loki.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -287,18 +270,12 @@ 0867D690FE84028FC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "Loki" */; - buildSettings = { - }; - buildStyles = ( - 4F0BB7EC011F40E904CA0E50 /* Debug */, - 4F0BB7ED011F40E904CA0E50 /* Release */, - ); hasScannedForEncodings = 1; mainGroup = 0867D691FE84028FC02AAC07 /* Loki */; productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */; projectDirPath = ""; targets = ( - 8D07F2BC0486CC7A007CD1D0 /* Loki */, + 8D07F2BC0486CC7A007CD1D0 /* loki */, ); }; /* End PBXProject section */ @@ -369,7 +346,7 @@ INSTALL_PATH = "$(HOME)/Library/Frameworks"; LIBRARY_STYLE = DYNAMIC; MACH_O_TYPE = mh_dylib; - PRODUCT_NAME = Loki; + PRODUCT_NAME = loki; WRAPPER_EXTENSION = framework; ZERO_LINK = NO; }; @@ -398,7 +375,7 @@ LIBRARY_STYLE = DYNAMIC; MACH_O_TYPE = mh_dylib; PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO; - PRODUCT_NAME = Loki; + PRODUCT_NAME = loki; SEPARATE_STRIP = NO; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = all; @@ -430,7 +407,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "Loki" */ = { + 4FADC24208B4156D00ABE55E /* Build configuration list for PBXNativeTarget "loki" */ = { isa = XCConfigurationList; buildConfigurations = ( 4FADC24308B4156D00ABE55E /* Debug */, @@ -439,7 +416,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "Loki" */ = { + 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "loki" */ = { isa = XCConfigurationList; buildConfigurations = ( 4FADC24708B4156D00ABE55E /* Debug */, diff --git a/macosx/README.OSX b/macosx/README.OSX index a130343..9aef4fb 100644 --- a/macosx/README.OSX +++ b/macosx/README.OSX @@ -8,9 +8,9 @@ In order to use this project you can open it using XCode and build it. However, sudo xcodebuild clean install -configuration Release DSTROOT=/ INSTALL_PATH=/Library/Frameworks DEPLOYMENT_LOCATION=YES -Be warned the clean part of the command with erase any previous directory called /Library/Frameworks/Loki.framework. Documentation for xcodebuild can be found by searching for xcodebuild in the xcode documentation. +Be warned the clean part of the command with erase any previous directory called /Library/Frameworks/loki.framework. Documentation for xcodebuild can be found by searching for xcodebuild in the xcode documentation. -Once you have Loki installed as a framework you can use it by adding the framework to your projects or if you are building from the command line by adding '-framework Loki' to your build command. Include the Loki framework header files in the following way #include. Note that depending on how you created your Xcode project you may need to manually set the framework search path to include /Library/Frameworks - if you include Loki headers in the above manner and xcode cannot find them then that is a likely source of the problem. Of course you should also check that the Loki framework actually is in /Library/Frameworks. +Once you have Loki installed as a framework you can use it by adding the framework to your projects or if you are building from the command line by adding '-framework loki' to your build command. Include the Loki framework header files in the following way #include. Note that depending on how you created your Xcode project you may need to manually set the framework search path to include /Library/Frameworks - if you include Loki headers in the above manner and xcode cannot find them then that is a likely source of the problem. Of course you should also check that the Loki framework actually is in /Library/Frameworks. The Xcode project does not currently build the yasli and flex parts of Loki. If anyone would like that then please post a request on the loki developers forum.