Changed an int to a size_t in my lexer, and removed the uname -m hack that Apple...

diff --git a/Darwin-i386.mk b/Darwin-i386.mk
deleted file mode 100644 (file)
index aa233eb..0000000
--- a/Darwin-i386.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-flags += -DCY_ATTACH
-code += Handler.o
-inject += Mach/Inject.o
-Mach/Inject.o: Trampoline.t.hpp Baton.hpp
-
-%.t.hpp: %.t.cpp
-       $(target)gcc -c -fno-exceptions -Iinclude -o $*.t.o $< && { file=($$($(target)otool -l $*.t.o | sed -e 'x; /^1/ { x; /^ *filesize / { s/^.* //; p; }; /^ *fileoff / { s/^.* //; p; }; x; }; x; /^ *cmd LC_SEGMENT$$/ { s/.*/1/; x; }; d;')); od -t x1 -j $${file[0]} -N $${file[1]} $*.t.o | sed -e 's/^[^ ]*//' | tr $$'\n' ' ' | sed -e 's/  */ /g;s/^ *//;s/ $$//;s/ /,/g;s/\([^,][^,]\)/0x\1/g' | sed -e 's/^/static const char $*_[] = {/;s/$$/};/' && echo && echo "/*" && $(target)otool -vVt $*.t.o && echo "*/"; } >$@ && rm -f $*.t.o

diff --git a/Darwin.mk b/Darwin.mk
index 34961a158475f67cd619ce7a03ce972cac368c91..db1dc260f1d749f6ea78e9cbbbf2533702d43bd6 100644 (file)
--- a/Darwin.mk
+++ b/Darwin.mk
@@ -9,5 +9,15 @@ library += -framework WebKit
 library += -liconv
 flags += -I/usr/include/ffi
 
+ifeq ($(uname_m),i386)
+flags += -DCY_ATTACH
+code += Handler.o
+inject += Mach/Inject.o
+Mach/Inject.o: Trampoline.t.hpp Baton.hpp
+
+%.t.hpp: %.t.cpp
+       $(target)gcc -c -fno-exceptions -Iinclude -o $*.t.o $< && { file=($$($(target)otool -l $*.t.o | sed -e 'x; /^1/ { x; /^ *filesize / { s/^.* //; p; }; /^ *fileoff / { s/^.* //; p; }; x; }; x; /^ *cmd LC_SEGMENT$$/ { s/.*/1/; x; }; d;')); od -t x1 -j $${file[0]} -N $${file[1]} $*.t.o | sed -e 's/^[^ ]*//' | tr $$'\n' ' ' | sed -e 's/  */ /g;s/^ *//;s/ $$//;s/ /,/g;s/\([^,][^,]\)/0x\1/g' | sed -e 's/^/static const char $*_[] = {/;s/$$/};/' && echo && echo "/*" && $(target)otool -vVt $*.t.o && echo "*/"; } >$@ && rm -f $*.t.o
+endif
+
 include Execute.mk
 include ObjectiveC.mk

diff --git a/makefile b/makefile
index 7711fbd015f0421914cd7d89cafad92c2adeee82..190fbb49ea4fa37dfe29602922c5c0b8e4b6588a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -50,7 +50,6 @@ uname_m ?= $(shell uname -m)
 
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
--include $(uname_s)-$(uname_m).mk
 
 ifneq ($(shell pkg-config libffi --modversion 2>/dev/null),)
 flags += $(shell pkg-config --cflags libffi)