misc: Point to correct simavr include dirs

[simavr] / Makefile.common

diff --git a/Makefile.common b/Makefile.common
index 6e1c7c3..178c3c9 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -5,7 +5,7 @@
 # 
 # The code is compiled "optimized" to the max.
 # 
-# The wierd "-Wl,--undefined=_mmcu,--section-start=.mmcu=0x910000"
+# The weird "-Wl,--undefined=_mmcu,--section-start=.mmcu=0x910000"
 # is used to tell the linker not to discard the .mmcu section,
 # otherwise the --gc-sections will delete it.
 # 
@@ -26,36 +26,66 @@
 #      You should have received a copy of the GNU General Public License
 #      along with simavr.  If not, see <http://www.gnu.org/licenses/>.
 
-# get the first character of what the compiler says it is, unless it's 'x86_64' doh
-ARCH = ${shell $(CC) -dumpmachine | sed -e 's/^x/i/' -e 's/\(.\).*/\1/'}
+# simavr directory
+SIMAVR         ?= ${shell for p in . .. ../.. ../../..;do test -d $$p/simavr/sim && echo $$p/simavr; done}
 
-ifeq ($(ARCH), i)
-CFLAGS += -mfpmath=sse -msse2
-endif
+# You can override the build settings with local changes in this file
+# for example:
+# export CC=clang
+# export CFLAGS=-march=corei7-avx
+# etc
+-include ${wildcard ${SIMAVR}/../.make.options*}
+
+# get the first character of what the compiler says it is, unless it's 'x86_64' doh
+ARCH           = ${shell $(CC) -dumpmachine | sed -e 's/^x/i/' -e 's/\(.\).*/\1/'}
 
-CFLAGS += -g --std=gnu99
-CFLAGS += ${patsubst %,-I%,${subst :, ,${IPATH}}}
-LDFLAGS += -lelf 
+CFLAGS         += -O2 -Wall
+CFLAGS         += -g
 
 ifeq (${shell uname}, Darwin)
-AVR_ROOT := "/Applications/Arduino.app/Contents/Resources/Java/hardware/tools/avr/"
-AVR_INC := ${AVR_ROOT}/avr-4/
-AVR := ${AVR_ROOT}/bin/avr-
-LFLAGS += -L/opt/local/lib
+# gcc 4.2 from MacOS is really not up to scratch anymore 
+CC                     = clang
+AVR_ROOT       := "/Applications/Arduino.app/Contents/Resources/Java/hardware/tools/avr/"
+AVR_INC        := ${AVR_ROOT}/avr-4/
+AVR            := ${AVR_ROOT}/bin/avr-
+# Thats for MacPorts libelf
+ifeq (${shell test -d /opt/local && echo Exists}, Exists)
+IPATH          += /opt/local/include
+LFLAGS         = -L/opt/local/lib/
+endif
 else
-AVR_ROOT := /usr/lib/avr
-AVR_INC := ${AVR_ROOT}
-AVR := avr-
-CFLAGS +=  -fPIC
+AVR_ROOT       := /usr/lib/avr
+AVR_INC        := ${AVR_ROOT}
+AVR            := avr-
+CFLAGS                 += -fPIC
 endif
 
-CC ?= gcc
-AR ?= ar
-RANLIB ?= ranlib
+CPPFLAGS       += --std=gnu99 -Wall
+CPPFLAGS       += ${patsubst %,-I%,${subst :, ,${IPATH}}}
+
+AVR_CPPFLAGS= ${CPPFLAGS} -idirafter ${AVR_INC}/include
+
+CC                     ?= clang
+AR                     ?= ar
+RANLIB                 ?= ranlib
+MKDIR          ?= mkdir -p
+INSTALL                ?= install
+SHELL          := ${shell which bash}
+       
+OBJ            = obj-${shell $(CC) -dumpmachine}
+LIBDIR         = ${shell pwd}/${SIMAVR}/${OBJ}
+LDFLAGS        += -L${LIBDIR} -lsimavr 
+
+LDFLAGS        += -lelf 
+
+ifeq (${shell uname}, Linux)
+# allow the shared library to be found in the build directory
+LFLAGS         += -Wl,-rpath,${LIBDIR}
+endif
 
 # The code is compiled "optimized" to the max.
 # 
-# The wierd "-Wl,--undefined=_mmcu,--section-start=.mmcu=0x910000"
+# The weird "-Wl,--undefined=_mmcu,--section-start=.mmcu=0x910000"
 # is used to tell the linker not to discard the .mmcu section,
 # otherwise the --gc-sections will delete it.
 
@@ -76,31 +106,29 @@ RANLIB ?= ranlib
                        -ffunction-sections -fdata-sections \
                        -Wl,--relax,--gc-sections \
                        -Wl,--undefined=_mmcu,--section-start=.mmcu=0x910000 \
-                       -I../include -I../../include \
+                       -I../simavr/sim/avr -I../../simavr/sim/avr \
                        ${^} -o ${@}
        @${AVR}size ${@}|sed '1d'
 
-OBJ = obj-${shell $(CC) -dumpmachine}
-
 # this rule has precedence
 ${OBJ}/sim_%.o : cores/sim_%.c
 ifeq ($(V),1)
-       $(CC) $(CFLAGS) -MMD \
-               -I${AVR_INC}/include/ \
+       $(CC) $(CPPFLAGS) $(CFLAGS) -MMD \
+               ${AVR_CPPFLAGS} \
                $<  -c -o $@
 else
-       @$(CC) $(CFLAGS) -MMD \
-               -I${AVR_INC}/include/ \
+       @$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS) -MMD \
+               ${AVR_CPPFLAGS} \
                $<  -c -o $@
        @echo CORE $<
 endif
 
 ${OBJ}/%.o: %.c
 ifeq ($(V),1)
-       $(CC) $(CFLAGS) -MMD \
+       $(CC) $(CPPFLAGS) $(CFLAGS) -MMD \
                $<  -c -o $@
 else
-       @$(CC) $(CFLAGS) -MMD \
+       @$(CC) $(CPPFLAGS) $(CFLAGS) -MMD \
                $<  -c -o $@
        @echo CC $<
 endif