aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorliamstask <liamstask@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-02-20 19:55:00 +0000
committerliamstask <liamstask@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-02-20 19:55:00 +0000
commita90a90ffcf0f90b2a4b6c24dc5a60e72652549f1 (patch)
treeced28926bc3a62add87e90d087156898ebf02c54 /demos
parent0fc33d47532b1b7727d576b3814498c8907b3c31 (diff)
downloadChibiOS-a90a90ffcf0f90b2a4b6c24dc5a60e72652549f1.tar.gz
ChibiOS-a90a90ffcf0f90b2a4b6c24dc5a60e72652549f1.tar.bz2
ChibiOS-a90a90ffcf0f90b2a4b6c24dc5a60e72652549f1.zip
adding simulator support for OS X
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1645 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
-rw-r--r--demos/GNU-Linux-GCC/Makefile17
1 files changed, 14 insertions, 3 deletions
diff --git a/demos/GNU-Linux-GCC/Makefile b/demos/GNU-Linux-GCC/Makefile
index 9d38e2637..f32f3c760 100644
--- a/demos/GNU-Linux-GCC/Makefile
+++ b/demos/GNU-Linux-GCC/Makefile
@@ -92,7 +92,6 @@ OPT = -ggdb -O2 -fomit-frame-pointer
# End of user defines
##############################################################################################
-
INCDIR = $(patsubst %,-I%,$(DINCDIR) $(UINCDIR))
LIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR))
DEFS = $(DDEFS) $(UDEFS)
@@ -100,9 +99,21 @@ ADEFS = $(DADEFS) $(UADEFS)
OBJS = $(ASRC:.s=.o) $(SRC:.c=.o)
LIBS = $(DLIBS) $(ULIBS)
-LDFLAGS = -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR)
ASFLAGS = -Wa,-amhls=$(<:.s=.lst) $(ADEFS)
-CPFLAGS = $(OPT) -Wall -Wextra -Wstrict-prototypes -fverbose-asm -Wa,-alms=$(<:.c=.lst) $(DEFS)
+CPFLAGS = $(OPT) -Wall -Wextra -Wstrict-prototypes -fverbose-asm $(DEFS)
+
+ifeq ($(HOST_OSX),yes)
+ OSX_SDK = /Developer/SDKs/MacOSX10.5.sdk
+ OSX_ARCH = -mmacosx-version-min=10.3 -arch i386
+
+ CPFLAGS += -isysroot $(OSX_SDK) $(OSX_ARCH)
+ LDFLAGS = -Wl -Map=$(PROJECT).map,-syslibroot,$(OSX_SDK),$(LIBDIR)
+ LIBS += $(OSX_ARCH)
+else
+ # Linux, or other
+ CPFLAGS += -Wa,-alms=$(<:.c=.lst)
+ LDFLAGS += -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR)
+endif
# Generate dependency information
CPFLAGS += -MD -MP -MF .dep/$(@F).d