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

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bc01ec059dd53dcb3508a14033309e48377682c6..b8efd58b280c4911ea88f285631e1184e03569d9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,7 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -fno-common -I$(srcdir)/include -DYYDEBUG=1
 AM_CPPFLAGS += -include $(srcdir)/config.h -include $(srcdir)/unconfig.h
 
+AM_CFLAGS = $(CY_ARCH)
 AM_CXXFLAGS = $(CY_ARCH)
 AM_OBJCXXFLAGS = $(CY_ARCH)
 AM_LDFLAGS = $(CY_ARCH)
@@ -43,9 +44,9 @@ libcycript_la_LDFLAGS = $(AM_LDFLAGS) $(CY_LDFLAGS)
 libcycript_la_LIBADD = -ldl
 
 lib_LTLIBRARIES += libcycript-sys.la
-libcycript_sys_la_SOURCES = Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
+libcycript_sys_la_SOURCES = ConvertUTF.c Highlight.cpp Network.cpp Output.cpp Parser.cpp Replace.cpp
 libcycript_sys_la_LDFLAGS = $(AM_LDFLAGS) $(CY_LDFLAGS)
-libcycript_sys_la_LIBADD = $(LTLIBFFI) $(LTLIBICONV) -ldl
+libcycript_sys_la_LIBADD = $(LTLIBFFI) -ldl
 
 libcycript_sys_la_SOURCES += Cycript.tab.cc
 libcycript_sys_la_SOURCES += lex.cy.cpp
@@ -112,15 +113,15 @@ lib_LTLIBRARIES += libcycript-sim.la
 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_LIBADD = $(LTOBJECTIVEC) $(LTLIBICONV) -ldl
+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