X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/dbf05bfd2ab79568fe706daa9112037192d4d9dd..55d15e4157686689f89a14aae6b8bb359ae2c6c1:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index 64ed082..f32b3bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-# Cycript - Optimizing JavaScript Compiler/Runtime
-# Copyright (C) 2009-2015  Jay Freeman (saurik)
+# Cycript - The Truly Universal Scripting Language
+# Copyright (C) 2009-2016  Jay Freeman (saurik)
 
 # GNU Affero General Public License, Version 3 {{{
 #
@@ -28,10 +28,21 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -DYYDEBUG=1 -DCY_SYSTEM="\"$(CY_SYSTEM)\""
 AM_CPPFLAGS += -include config.h -include $(srcdir)/unconfig.h
 
-AM_CFLAGS = -fvisibility=hidden
-AM_CXXFLAGS = -fvisibility=hidden
-AM_OBJCXXFLAGS = -fvisibility=hidden
-AM_LDFLAGS = -fvisibility=hidden
+CY_FLAGS = 
+CY_FLAGS += -fvisibility=hidden
+
+if CY_ANDROID
+CY_FLAGS += -fPIE
+endif
+
+AM_CFLAGS = $(CY_FLAGS)
+AM_CXXFLAGS = $(CY_FLAGS)
+AM_OBJCXXFLAGS = $(CY_FLAGS)
+AM_LDFLAGS = $(CY_FLAGS)
+
+if CY_ANDROID
+AM_LDFLAGS += -rdynamic -fPIE -pie
+endif
 
 AM_OBJCXXFLAGS += -fobjc-exceptions
 
@@ -56,6 +67,12 @@ bin_PROGRAMS = cycript
 cycript_SOURCES = Console.cpp
 cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
 libcycript_la_SOURCES += Complete.cpp
+
+if CY_ANDROID
+bin_PROGRAMS += cycript-pie
+cycript_pie_SOURCES = pie.c
+cycript_pie_LDFLAGS = -fno-PIE
+endif
 endif
 
 if CY_EXECUTE
@@ -68,36 +85,37 @@ AM_CPPFLAGS += -DCY_EXECUTE
 filters += C
 
 CLEANFILES += libcycript.db
-libcycript.db: Bridge.def libcycript.sh
-	$(srcdir)/libcycript.sh $(CY_SYSTEM) $@ $<
+libcycript.db: Bridge.def libcycript.py
+	$(srcdir)/libcycript.py $(CY_SYSTEM) $@ $(srcdir) <$<
 
 if CY_PRELINK
+CY_LANGFLAGS = -DCY_JAVA=$(CY_JAVA) -DCY_PYTHON=$(CY_PYTHON) -DCY_OBJECTIVEC=$(CY_OBJECTIVEC)
+
 CLEANFILES += Analyze
 Analyze: Analyze.cpp Error.cpp Output.cpp Replace.cpp Syntax.cpp
-	$(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -std=c++11 $(LDFLAGS_FOR_BUILD) -DCY_OBJECTIVEC=$(CY_OBJECTIVEC) -I$(srcdir)/extra -o $@ $^ $(CY_LIBCLANG) -Wno-bitwise-op-parentheses -Wno-dangling-else -Wno-logical-op-parentheses
+	$(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) -std=c++11 $(LDFLAGS_FOR_BUILD) $(CY_LANGFLAGS) -I$(srcdir)/extra -o $@ $^ $(CY_LIBCLANG) -Wno-bitwise-op-parentheses -Wno-dangling-else -Wno-logical-op-parentheses
 
 CLEANFILES += Bridge.def
 Bridge.def: Analysis.cpp Analyze
-	./Analyze $< $(OBJCXX) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) >$@
+	./Analyze $< $(OBJCXX) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(CY_LANGFLAGS) >$@
 else
 CLEANFILES += Bridge.def
 Bridge.def: Bridge.def.in
 	cat $< >$@
 endif
 
-CLEANFILES += Bridge.gperf
-Bridge.gperf: Bridge.def Bridge.sh
-	$(srcdir)/Bridge.sh <$< >$@
+#CLEANFILES += Hasher.gperf
+#Hasher.gperf: Hasher.def Hasher.sh
+#	$(srcdir)/Hasher.sh <$< >$@
 
-CLEANFILES += Bridge.hpp
-Bridge.hpp: Bridge.gperf
-	$(GPERF) $< >$@
+#CLEANFILES += Hasher.hpp
+#Hasher.hpp: Hasher.gperf
+#	$(GPERF) $< >$@
 endif
 
 if CY_JAVA
 filters += Java
 libcycript_la_SOURCES += Java/Execute.cpp
-libcycript_la_LIBADD += $(LTJAVA)
 dat_DATA += libcycript.jar
 
 CLEANFILES += Class
@@ -124,6 +142,7 @@ libcycript_la_LIBADD += $(LTPYTHON)
 endif
 
 if CY_OBJECTIVEC
+AM_CPPFLAGS += -DCY_OBJECTIVEC
 filters += ObjectiveC
 libcycript_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm
 libcycript_la_LIBADD += $(LTOBJECTIVEC)