Look up path of Mac OS X SDK for Simulator build.

diff --git a/Makefile.am b/Makefile.am
index 34c7b7e38d752800358de1b25c267aab4d0e0a70..b8efd58b280c4911ea88f285631e1184e03569d9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,7 +113,7 @@ lib_LTLIBRARIES += libcycript-sim.la
 libcycript_sim_la_SOURCES = $(libcycript_sys_la_SOURCES)
 libcycript_sim_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libcycript_sim_la_SOURCES = $(libcycript_sys_la_SOURCES)
 libcycript_sim_la_CPPFLAGS = $(AM_CPPFLAGS)
 

-CY_SIM_FLAGS = -arch i386 -isysroot $(CY_IOS_SIMULATOR)
+CY_SIM_FLAGS = -arch i386 -isysroot $(CY_XCODE_IOSSIMSDK)

 libcycript_sim_la_CXXFLAGS = $(CY_SIM_FLAGS)
 libcycript_sim_la_OBJCXXFLAGS = $(CY_SIM_FLAGS)
 libcycript_sim_la_LDFLAGS = $(CY_SIM_FLAGS) $(CY_LDFLAGS)
 libcycript_sim_la_CXXFLAGS = $(CY_SIM_FLAGS)
 libcycript_sim_la_OBJCXXFLAGS = $(CY_SIM_FLAGS)
 libcycript_sim_la_LDFLAGS = $(CY_SIM_FLAGS) $(CY_LDFLAGS)


@@ -121,7 +121,7 @@ libcycript_sim_la_LDFLAGS = $(CY_SIM_FLAGS) $(CY_LDFLAGS)
 libcycript_sim_la_LIBADD = $(LTOBJECTIVEC) -ldl
 libcycript_sim_la_LIBADD += $(LTOBJECTIVEC) $(LTJAVASCRIPTCORE)
 
 libcycript_sim_la_LIBADD = $(LTOBJECTIVEC) -ldl
 libcycript_sim_la_LIBADD += $(LTOBJECTIVEC) $(LTJAVASCRIPTCORE)
 

-libcycript_sim_la_CPPFLAGS += -idirafter /usr/include
+libcycript_sim_la_CPPFLAGS += -idirafter $(CY_XCODE_MACOSXSDK)/usr/include

 libcycript_sim_la_LDFLAGS += -Wl,/usr/lib/libffi.dylib
 
 libcycript_sim_la_OBJCXXFLAGS += -fobjc-abi-version=2 -fobjc-legacy-dispatch
 libcycript_sim_la_LDFLAGS += -Wl,/usr/lib/libffi.dylib
 
 libcycript_sim_la_OBJCXXFLAGS += -fobjc-abi-version=2 -fobjc-legacy-dispatch

diff --git a/Makefile.in b/Makefile.in
index 35b50b013d116fe69ac35a11ba4ee0900c136836..c8278001a63c9be1998c712e1fce9f772d0a47a2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -394,9 +394,10 @@ CY_ARCH = @CY_ARCH@
 CY_ATTACH_GROUP = @CY_ATTACH_GROUP@
 CY_EXECUTE = @CY_EXECUTE@
 CY_FILTERS = @CY_FILTERS@
 CY_ATTACH_GROUP = @CY_ATTACH_GROUP@
 CY_EXECUTE = @CY_EXECUTE@
 CY_FILTERS = @CY_FILTERS@

-CY_IOS_SIMULATOR = @CY_IOS_SIMULATOR@

 CY_MACH = @CY_MACH@
 CY_OBJECTIVEC = @CY_OBJECTIVEC@
 CY_MACH = @CY_MACH@
 CY_OBJECTIVEC = @CY_OBJECTIVEC@

+CY_XCODE_IOSSIMSDK = @CY_XCODE_IOSSIMSDK@
+CY_XCODE_MACOSXSDK = @CY_XCODE_MACOSXSDK@

 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@


@@ -565,8 +566,9 @@ filters = $(CY_FILTERS) $(am__append_4) $(am__append_6)
 libcycript_sim_la_SHORTNAME = sim
 @CY_IOS_SIMULATOR_TRUE@libcycript_sim_la_SOURCES = $(libcycript_sys_la_SOURCES)
 @CY_IOS_SIMULATOR_TRUE@libcycript_sim_la_CPPFLAGS = $(AM_CPPFLAGS) \
 libcycript_sim_la_SHORTNAME = sim
 @CY_IOS_SIMULATOR_TRUE@libcycript_sim_la_SOURCES = $(libcycript_sys_la_SOURCES)
 @CY_IOS_SIMULATOR_TRUE@libcycript_sim_la_CPPFLAGS = $(AM_CPPFLAGS) \

-@CY_IOS_SIMULATOR_TRUE@        -idirafter /usr/include
-@CY_IOS_SIMULATOR_TRUE@CY_SIM_FLAGS = -arch i386 -isysroot $(CY_IOS_SIMULATOR)
+@CY_IOS_SIMULATOR_TRUE@        -idirafter \
+@CY_IOS_SIMULATOR_TRUE@        $(CY_XCODE_MACOSXSDK)/usr/include
+@CY_IOS_SIMULATOR_TRUE@CY_SIM_FLAGS = -arch i386 -isysroot $(CY_XCODE_IOSSIMSDK)

 @CY_IOS_SIMULATOR_TRUE@libcycript_sim_la_CXXFLAGS = $(CY_SIM_FLAGS)
 @CY_IOS_SIMULATOR_TRUE@libcycript_sim_la_OBJCXXFLAGS =  \
 @CY_IOS_SIMULATOR_TRUE@        $(CY_SIM_FLAGS) -fobjc-abi-version=2 \
 @CY_IOS_SIMULATOR_TRUE@libcycript_sim_la_CXXFLAGS = $(CY_SIM_FLAGS)
 @CY_IOS_SIMULATOR_TRUE@libcycript_sim_la_OBJCXXFLAGS =  \
 @CY_IOS_SIMULATOR_TRUE@        $(CY_SIM_FLAGS) -fobjc-abi-version=2 \

diff --git a/configure b/configure
index 6148c8d268432681926cbbd14fc7f8ccfdebfdb4..869511da2a306690dec843d6d04b0b476d7e8440 100755 (executable)
--- a/configure
+++ b/configure
@@ -669,7 +669,8 @@ WEBKIT_CFLAGS
 CY_EXECUTE
 CY_IOS_SIMULATOR_FALSE
 CY_IOS_SIMULATOR_TRUE
 CY_EXECUTE
 CY_IOS_SIMULATOR_FALSE
 CY_IOS_SIMULATOR_TRUE

-CY_IOS_SIMULATOR
+CY_XCODE_IOSSIMSDK
+CY_XCODE_MACOSXSDK

 XCODEBUILD
 CY_ARCH
 CY_FILTERS
 XCODEBUILD
 CY_ARCH
 CY_FILTERS


@@ -18342,12 +18343,14 @@ fi
 
 if test "x$XCODEBUILD" != x; then :
 
 
 if test "x$XCODEBUILD" != x; then :
 

-    CY_IOS_SIMULATOR=`xcodebuild -sdk iphonesimulator -version Path`
+    CY_XCODE_MACOSXSDK=`xcodebuild -sdk macosx -version Path`
+
+    CY_XCODE_IOSSIMSDK=`xcodebuild -sdk iphonesimulator -version Path`

 
 
 fi
 
 
 
 fi
 

- if test "x$CY_IOS_SIMULATOR" != x; then
+ if test "x$CY_XCODE_IOSSIMSDK" != x; then

   CY_IOS_SIMULATOR_TRUE=
   CY_IOS_SIMULATOR_FALSE='#'
 else
   CY_IOS_SIMULATOR_TRUE=
   CY_IOS_SIMULATOR_FALSE='#'
 else

diff --git a/configure.ac b/configure.ac
index 0bd641e6047d1eca821da1edc02ecd291663a44e..ed3093087a554d718caa5532aaf8db8019b4f77c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -156,10 +156,11 @@ dnl iOS SDK {{{
 AC_PATH_PROG([XCODEBUILD], [xcodebuild])
 
 AS_IF([test "x$XCODEBUILD" != x], [
 AC_PATH_PROG([XCODEBUILD], [xcodebuild])
 
 AS_IF([test "x$XCODEBUILD" != x], [

-    AC_SUBST([CY_IOS_SIMULATOR], [`xcodebuild -sdk iphonesimulator -version Path`])
+    AC_SUBST([CY_XCODE_MACOSXSDK], [`xcodebuild -sdk macosx -version Path`])
+    AC_SUBST([CY_XCODE_IOSSIMSDK], [`xcodebuild -sdk iphonesimulator -version Path`])

 ])
 
 ])
 

-AM_CONDITIONAL([CY_IOS_SIMULATOR], [test "x$CY_IOS_SIMULATOR" != x])
+AM_CONDITIONAL([CY_IOS_SIMULATOR], [test "x$CY_XCODE_IOSSIMSDK" != x])

 dnl }}}
 
 AC_DEFUN([CY_LT_LIB], [
 dnl }}}
 
 AC_DEFUN([CY_LT_LIB], [