Merge branch 'refactor-syntax_unicode' of https://github.com/runrev/livecode into refactor-syntax_unicode

Fraser J. Gordon · Fraser J. Gordon · commit fd77a4eba4c7 · 2014-06-20T11:41:16.000+01:00
diff --git a/engine/src/osxans.mm b/engine/src/osxans.mm
@@ -673,7 +673,7 @@ int MCA_do_file_dialog(MCStringRef p_title, MCStringRef p_prompt, MCStringRef *p
 		else
         // MAYBE BUG
 			[t_panel setTitle: [NSString stringWithMCStringRef: p_prompt]];
-		[t_panel setDelegate: /*(id<NSOpenSavePanelDelegate>)*/t_accessory];
+		[t_panel setDelegate: (id<NSOpenSavePanelDelegate>)t_accessory];
 
 		if (p_type_count > 1)	
 
diff --git a/rules/Debug.xcconfig b/rules/Debug.xcconfig
@@ -3,3 +3,4 @@ COPY_PHASE_STRIP = NO
 GCC_OPTIMIZATION_LEVEL = 0
 GCC_PREPROCESSOR_DEFINITIONS = $(GLOBAL_GCC_PREPROCESSOR_DEFINITIONS) _DEBUG
 
+ARCHS = i386
diff --git a/rules/Global.xcconfig b/rules/Global.xcconfig
@@ -1,6 +1,6 @@
 #include "../version"
 
-SDKROOT = macosx10.5
+SDKROOT = macosx10.6
 
 OWNER = .
 SOLUTION_DIR = $(PROJECT_DIR)/../$(OWNER)
@@ -17,6 +17,4 @@ SHARED_PRECOMPS_DIR=$(OBJROOT)/Precompiled/$(CURRENT_ARCH)
 GLOBAL_GCC_PREPROCESSOR_DEFINITIONS=TARGET_PLATFORM_MACOS_X _MACOSX
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS=NO
 ALWAYS_SEARCH_USER_PATHS = NO
-MACOSX_DEPLOYMENT_TARGET = 10.5
-GCC_VERSION =
-//GCC_VERSION[sdk=macosx10.4] = 4.0
+MACOSX_DEPLOYMENT_TARGET = 10.6

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,4 @@ COPY_PHASE_STRIP = NO`
`3`	`3`	`GCC_OPTIMIZATION_LEVEL = 0`
`4`	`4`	`GCC_PREPROCESSOR_DEFINITIONS = $(GLOBAL_GCC_PREPROCESSOR_DEFINITIONS) _DEBUG`
`5`	`5`
	`6`	`+ARCHS = i386`