adds Xcode 4 compatibility

vlfeat · May 5, 2011 · 3c18042 · 3c18042
1 parent d6d36a4
commit 3c18042
Show file tree

Hide file tree

Showing 7 changed files with 253 additions and 164 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,9 +30,13 @@ toolbox/mex
 toolbox/noprefix
 
 # Xcode
+vlfeat.xcodeproj/*.mode1
 vlfeat.xcodeproj/*.mode1v3
+vlfeat.xcodeproj/*.mode2v3
 vlfeat.xcodeproj/*.pbxuser
 vlfeat.xcodeproj/*.perspective*
+vlfeat.xcodeproj/*.xcworkspace
+vlfeat.xcodeproj/xcuserdata
 
 # Visual C++
 vlfeat.suo

diff --git a/Makefile b/Makefile
@@ -147,16 +147,17 @@ CFLAGS += $(if $(PROFILE), -g,)
 
 # Mac OS X Intel 32
 ifeq ($(ARCH),maci)
-SDKROOT := /Developer/SDKs/MacOSX10.5.sdk
+SDKROOT ?= /Developer/SDKs/MacOSX10.5.sdk
+MACOSX_DEPLOYMENT_TARGET ?= 10.5
 CFLAGS += -m32 -isysroot $(SDKROOT)
-LDFLAGS += -lm -mmacosx-version-min=10.5
+LDFLAGS += -lm -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
 endif
 
 # Mac OS X Intel 64
 ifeq ($(ARCH),maci64)
-SDKROOT := /Developer/SDKs/MacOSX10.5.sdk
+SDKROOT ?= /Developer/SDKs/MacOSX10.5.sdk
 CFLAGS += -m64 -isysroot $(SDKROOT)
-LDFLAGS += -lm -mmacosx-version-min=10.5
+LDFLAGS += -lm -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
 endif
 
 # Linux-32

diff --git a/make/dll.mak b/make/dll.mak
@@ -90,7 +90,7 @@ $(BINDIR)/lib$(DLL_NAME).dylib : $(dll_obj)
 	            -compatibility_version $(VER)                    \
                     -current_version $(VER)                          \
                     -syslibroot $(SDKROOT)                           \
-		    -macosx_version_min 10.5                         \
+		    -macosx_version_min $(MACOSX_DEPLOYMENT_TARGET)  \
 	            -o $@ -undefined suppress $^
 
 $(BINDIR)/lib$(DLL_NAME).so : $(dll_obj)

diff --git a/vlfeat.xcodeproj/project.pbxproj b/vlfeat.xcodeproj/project.pbxproj
diff --git a/vlfeat.xcodeproj/xcshareddata/xcschemes/make doc-api.xcscheme b/vlfeat.xcodeproj/xcshareddata/xcschemes/make doc-api.xcscheme
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2D72E9C90E4765D2005DAA47"
+               BuildableName = "make doc-api"
+               BlueprintName = "make doc-api"
+               ReferencedContainer = "container:vlfeat.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      displayScaleIsEnabled = "NO"
+      displayScale = "1.00"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      displayScaleIsEnabled = "NO"
+      displayScale = "1.00"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/vlfeat.xcodeproj/xcshareddata/xcschemes/make info.xcscheme b/vlfeat.xcodeproj/xcshareddata/xcschemes/make info.xcscheme
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2D72EA220E476C05005DAA47"
+               BuildableName = "make info"
+               BlueprintName = "make info"
+               ReferencedContainer = "container:vlfeat.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      displayScaleIsEnabled = "NO"
+      displayScale = "1.00"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      displayScaleIsEnabled = "NO"
+      displayScale = "1.00"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/vlfeat.xcodeproj/xcshareddata/xcschemes/make.xcscheme b/vlfeat.xcodeproj/xcshareddata/xcschemes/make.xcscheme
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2D732DBE0CF8BFFD0099B03C"
+               BuildableName = "make"
+               BlueprintName = "make"
+               ReferencedContainer = "container:vlfeat.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
+      displayScaleIsEnabled = "NO"
+      displayScale = "1.00"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      displayScaleIsEnabled = "NO"
+      displayScale = "1.00"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>