Several fixes and cleanup to allow IJSVG to run normally in standalon…

…e/original xcodeproj. Doing this in preparation of potentially adding IJSVG as a child project or submodule to SL
mattreagan29 · Dec 9, 2015 · 16c4197 · 16c4197
1 parent 64547c7
commit 16c4197
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/IJSVGExample/IJSVGExample.xcodeproj/project.pbxproj b/IJSVGExample/IJSVGExample.xcodeproj/project.pbxproj
@@ -577,9 +577,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COMBINE_HIDPI_IMAGES = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+					"IJSVG_EXAMPLE_TESTS_NO_FLIPPED_Y=1",
+				);
 				INFOPLIST_FILE = IJSVGExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx10.11;
 			};
 			name = Debug;
 		};
@@ -591,6 +597,7 @@
 				INFOPLIST_FILE = IJSVGExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx10.11;
 			};
 			name = Release;
 		};
@@ -606,10 +613,12 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
+					"IJSVG_EXAMPLE_TESTS_NO_FLIPPED_Y=1",
 				);
 				INFOPLIST_FILE = IJSVGExampleTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/IJSVGExample.app/Contents/MacOS/IJSVGExample";
 			};
 			name = Debug;
@@ -626,6 +635,7 @@
 				INFOPLIST_FILE = IJSVGExampleTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/IJSVGExample.app/Contents/MacOS/IJSVGExample";
 			};
 			name = Release;

diff --git a/source/IJSVG.h b/source/IJSVG.h
@@ -10,7 +10,16 @@
 #import "IJSVGParser.h"
 #import "IJSVGBezierPathAdditions.h"
 
-#define IJSVG_USES_FLIPPED_Y_RENDERING 1
+/*  This is a baked-in value that determines whether the IJSVG
+    engine should use a flipped Y coordinate system. By default
+    this is now ON, however for the original IJSVG example app
+    and tests this should be disabled by default. */
+
+#ifdef IJSVG_EXAMPLE_TESTS_NO_FLIPPED_Y
+    #define IJSVG_USES_FLIPPED_Y_RENDERING 0
+#else
+    #define IJSVG_USES_FLIPPED_Y_RENDERING 1
+#endif
 
 @class IJSVG;
 

diff --git a/source/IJSVGUtils.m b/source/IJSVGUtils.m
@@ -190,7 +190,7 @@ + (void)logParameters:(CGFloat *)param
     {
         [str appendFormat:@"%f ",param[i]];
     }
-    DLog(@"%@",str);
+    NSLog(@"%@",str);
 }
 
 + (CGFloat)floatValue:(NSString *)string