Fix some data path bugs

astrotools · Feb 9, 2015 · 430caae · 430caae
1 parent 76c2d69
commit 430caae
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/SwissEphemeris-iOS.xcodeproj/project.pbxproj b/SwissEphemeris-iOS.xcodeproj/project.pbxproj
@@ -1227,6 +1227,7 @@
 				EXECUTABLE_PREFIX = "";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					"STATIC_LIBRARY=1",
 					"DEBUG=1",
 					"$(inherited)",
 				);
@@ -1244,6 +1245,10 @@
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
 				EXECUTABLE_PREFIX = "";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"STATIC_LIBRARY=1",
+					"$(inherited)",
+				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/SwissEphemeris/SwissEphGlue.m b/SwissEphemeris/SwissEphGlue.m
@@ -12,17 +12,18 @@
 #import "sweph.h"
 
 static NSBundle *_SWEDataFilesGetBundle() {
-#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
-    return [NSBundle bundleWithIdentifier:@"com.astro.SwissEphemeris"];
-#else
+#if STATIC_LIBRARY
     return [NSBundle mainBundle];
+#else
+    return [NSBundle bundleWithIdentifier:@"com.astro.SwissEphemeris"];
 #endif
 }
 
 static NSURL *SWEDataFilesGetFrameworkURL() {
     return _SWEDataFilesGetBundle().resourceURL;
 }
 
+#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
 static NSURL *SWEDataFilesGetExternalURL() {
     static NSURL *pathURL;
     static dispatch_once_t token;
@@ -37,6 +38,7 @@
 
     return pathURL;
 }
+#endif
 
 #if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
 void _SEGDataFilesCopyFrameworkPath(char *ephepath, __unused char *empty) {
@@ -45,10 +47,11 @@ void _SEGDataFilesCopyFrameworkPath(char *ephepath, __unused char *empty) {
 #endif
 
 void _SEGDataFilesCopyPathForFile(char *datapath, const char *fname, const char *ephepath) {
-#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
+#if !STATIC_LIBRARY
     NSFileManager *fm = [NSFileManager defaultManager];
     NSString *fileName = @(fname);
 
+#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
     // Application Support path
     // This is the escape hatch for code signing (immutable resources)
     NSURL *pathURL = SWEDataFilesGetExternalURL();
@@ -57,6 +60,7 @@ void _SEGDataFilesCopyPathForFile(char *datapath, const char *fname, const char
         strcat(datapath, "/");
         return;
     }
+#endif
 
     // Given data path
     // There are no ast directories in the framework resources directory
@@ -74,6 +78,7 @@ void _SEGDataFilesCopyPathForFile(char *datapath, const char *fname, const char
 void _SEGLibraryInitialize() {
     swe_set_ephe_path((char *)SWEDataFilesGetFrameworkURL().fileSystemRepresentation);
 
+#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
     NSURL *externalURL = SWEDataFilesGetExternalURL();
     if (![[NSFileManager defaultManager] fileExistsAtPath:externalURL.path]) {
         NSError *error;
@@ -83,6 +88,7 @@ void _SEGLibraryInitialize() {
             NSLog(@"Error creating Application Support directory: %@", error);
         }
     }
+#endif
 }
 
 void _SEGLibraryFinalize() {