Remove xcodeproj configure stuff

macvim-dev · Dec 19, 2015 · ce495b8 · ce495b8
1 parent c0a5310
commit ce495b8
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 17 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -2944,7 +2944,7 @@ RELEASEDIR = MacVim/build/Release
 DMGDIR = MacVim/build/dmg
 
 macvim: $(VIMTARGET)
-	xcodebuild -project MacVim/$(XCODEPROJ) $(XCODEFLAGS)
+	xcodebuild -project MacVim/MacVim.xcodeproj $(XCODEFLAGS)
 
 macvim-dmg: macvim
 	mkdir -p $(DMGDIR)

diff --git a/src/auto/configure b/src/auto/configure
@@ -623,7 +623,6 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 LINK_AS_NEEDED
 DEPEND_CFLAGS_FILTER
-XCODEPROJ
 XCODEFLAGS
 MAKEMO
 MSGFMT
@@ -13471,13 +13470,6 @@ fi
 
 
 
-
-  macosx_version=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
-  case "$macosx_version" in
-    10.4|10.5)	XCODEPROJ="MacVim_legacy.xcodeproj";;
-    *)		XCODEPROJ="MacVim.xcodeproj";;
-  esac
-
 fi
 
 

diff --git a/src/config.mk.in b/src/config.mk.in
@@ -21,7 +21,6 @@ CC		= @CC@
 DEFS		= @DEFS@
 CFLAGS		= @CFLAGS@
 CPPFLAGS	= @CPPFLAGS@
-XCODEPROJ	= @XCODEPROJ@
 XCODEFLAGS	= @XCODEFLAGS@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

diff --git a/src/configure.in b/src/configure.in
@@ -4079,13 +4079,6 @@ if test "x$MACOSX" = "xyes"; then
     [ AC_MSG_RESULT(using default) ])
 
   AC_SUBST(XCODEFLAGS)
-
-  macosx_version=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([[0-9]]*\.[[0-9]]*\).*/\1/'`
-  case "$macosx_version" in
-    10.4|10.5)	XCODEPROJ="MacVim_legacy.xcodeproj";;
-    *)		XCODEPROJ="MacVim.xcodeproj";;
-  esac
-  AC_SUBST(XCODEPROJ)
 fi