Skip to content

Commit a8ab57c

Browse files
committed
Merge branch 'master' of https://github.com/tebe6502/Mad-Pascal
2 parents 429ba3a + 4edfc67 commit a8ab57c

File tree

2 files changed

+34
-32
lines changed

2 files changed

+34
-32
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ samples/WinMerge.txt
2727
test/config.ini
2828

2929
origin/mp.exe
30+
/mp

src/Makefile

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
11
# See https://stackoverflow.com/questions/714100/os-detecting-makefile
22

33
SRC = mp.pas \
4-
Common.pas \
5-
Diagnostic.pas \
6-
FileIO.pas \
7-
MathEvaluate.pas \
8-
Messages.pas \
9-
Numbers.pas \
10-
Optimize.pas \
11-
Parser.pas \
12-
Scanner.pas \
13-
StringUtilities.pas \
14-
TestUnits.pas \
15-
Utilities.pas \
16-
include/*.inc \
17-
include/opt6502/*.inc \
18-
include/opt65c02/*.inc \
19-
targets/*.inc
4+
Common.pas \
5+
Diagnostic.pas \
6+
FileIO.pas \
7+
MathEvaluate.pas \
8+
Messages.pas \
9+
Numbers.pas \
10+
Optimize.pas \
11+
Parser.pas \
12+
Scanner.pas \
13+
StringUtilities.pas \
14+
TestUnits.pas \
15+
Utilities.pas \
16+
include/*.inc \
17+
include/opt6502/*.inc \
18+
include/opt65c02/*.inc \
19+
targets/*.inc
2020

2121
BINBASEDIR = ../bin
2222
ifeq ($(OS),Windows_NT)
23-
BINDIR = $(BINBASEDIR)/windows_x86_64
24-
BIN = $(BINDIR)/mp.exe
23+
BINDIR = $(BINBASEDIR)/windows_x86_64
24+
BIN = $(BINDIR)/mp.exe
2525
else
26-
UNAME_S := $(shell uname -s)
27-
UNAME_P := $(shell uname -p)
28-
ifeq ($(UNAME_S),Linux)
29-
# TODO
26+
UNAME_S := $(shell uname -s)
27+
UNAME_P := $(shell uname -p)
28+
ifeq ($(UNAME_S),Linux)
29+
#BINDIR = $(BINBASEDIR)/linux_$(UNAME_P)
30+
BINDIR = $(BINBASEDIR)
3031
BIN = $(BINDIR)/mp
31-
endif
32-
ifeq ($(UNAME_S),Darwin)
33-
ifneq ($(filter arm%,$(UNAME_P)),)
34-
BINDIR = $(BINBASEDIR)/macosx_aarch64
35-
endif i
36-
ifeq ($(UNAME_P),x86_64)
37-
BINDIR = $(BINBASEDIR)/macosx_x86_64
38-
endif
39-
BIN = $(BINDIR)/mp
40-
endif
32+
endif
33+
ifeq ($(UNAME_S),Darwin)
34+
ifneq ($(filter arm%,$(UNAME_P)),)
35+
BINDIR = $(BINBASEDIR)/macosx_aarch64
36+
endif
37+
ifeq ($(UNAME_P),x86_64)
38+
BINDIR = $(BINBASEDIR)/macosx_x86_64
39+
endif
40+
BIN = $(BINDIR)/mp
41+
endif
4142
endif
4243

4344
$(BIN): $(SRC)

0 commit comments

Comments
 (0)