UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add memory_map for simulator.

Browse Source 
Also use clang for the simulator building.

Change-Id: I87f5b938d9066375fbfabfdcdd3c5218c9790bb0
This commit is contained in:
Felix Raimundo
2016-03-22 13:44:31 +01:00
parent 9f9d05e822
commit 605dd9f372
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -36,6 +36,7 @@ default: app.elf
endif
run: app_run
.PHONY: info
info:
@echo "========= BUILD SETTINGS ======"
@echo "DEBUG = $(DEBUG)"
@@ -50,7 +51,6 @@ info:
@echo "==============================="
ifeq ($(USE_LIBA),0)
#LDFLAGS += -lc -lc++ -lcrt1.o
else
SFLAGS += -ffreestanding -nostdinc -nostdlib
include liba/Makefile

6
Makefile.simulator
View File

@@ -1,6 +1,6 @@
CC=gcc
CXX=g++
LD=g++
CC=clang
CXX=clang++
LD=clang++
SIZE=size
USE_LIBA=0

8
ion/src/simulator/Makefile
View File

@@ -3,7 +3,11 @@ objs += $(addprefix ion/src/simulator/boot/, main.o)
objs += $(addprefix ion/src/simulator/display/, fltklcd.o)
objs += $(addprefix ion/src/simulator/keyboard/, fltkkbd.o)
#SFLAGS += -I/usr/local/Cellar/fltk/1.3.3/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_THREAD_SAFE -D_REENTRANT
SFLAGS += `fltk-config --cflags`
#LDFLAGS += -L/usr/local/Cellar/fltk/1.3.3/lib -lfltk -lpthread -framework Cocoa
LDFLAGS += `fltk-config --ldflags`
.PHONY: %_memory_map
%_memory_map:
@echo "========== MEMORY MAP ========="
@echo "No memory map on simulator."
@echo "==============================="