beebasm
changeset 28:1347586d66b9
Added in Linux-related build changes.
| author | RichTW <richtw1@gmail.com> |
|---|---|
| date | Sun Feb 27 16:18:43 2011 +0100 |
| parents | 4a2c231c59ff |
| children | 5d32efc3f4ad |
| files | beebasm.exe src/Makefile src/Makefile.inc |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line diff
1.1 Binary file beebasm.exe has changed
2.1 --- a/src/Makefile Sun Feb 27 14:02:12 2011 +0100 2.2 +++ b/src/Makefile Sun Feb 27 16:18:43 2011 +0100 2.3 @@ -28,9 +28,9 @@ 2.4 2.5 BUILD_DIR := ./objects 2.6 2.7 -# Define target file 2.8 +# Define target file (minus any platform-specific extension) 2.9 2.10 -TARGET := ../beebasm.exe 2.11 +TARGET := ../beebasm 2.12 2.13 # Define compiler switches 2.14 2.15 @@ -47,7 +47,7 @@ 2.16 2.17 # Define GNU libs to link 2.18 2.19 -LDLIBS := -lstdc++ 2.20 +LDLIBS := -lstdc++ -lm 2.21 2.22 # Parameters to the executable 2.23
3.1 --- a/src/Makefile.inc Sun Feb 27 14:02:12 2011 +0100 3.2 +++ b/src/Makefile.inc Sun Feb 27 16:18:43 2011 +0100 3.3 @@ -55,6 +55,7 @@ 3.4 3.5 PLATFORM_LIST := mingw-gcc3 3.6 PLATFORM_LIST += mingw-gcc4 3.7 +PLATFORM_LIST += linux 3.8 3.9 3.10 # Try to determine the build platform if it wasn't explicitly specified on the command line 3.11 @@ -63,6 +64,13 @@ 3.12 # Do checks with $(shell uname -s) and/or $(OSTYPE) here to try to automatically determine 3.13 # the appropriate platform type. Ultimately, the goal is to automatically set the make 3.14 # variable $(PLATFORM) to one of the values in PLATFORM_LIST, above. 3.15 + 3.16 +ifneq (,$(findstring linux,$(OSTYPE))) 3.17 +PLATFORM := linux 3.18 +else ifeq ($(shell uname -s),Linux) 3.19 +PLATFORM := linux 3.20 +endif 3.21 + 3.22 endif 3.23 3.24 3.25 @@ -97,6 +105,7 @@ 3.26 3.27 ifeq ($(PLATFORM),mingw-gcc4) 3.28 LDFLAGS += -static 3.29 +TARGET := $(addsuffix .exe,$(TARGET)) 3.30 endif 3.31 3.32
