Skip to content

Commit d78caf6

Browse files
committed
FIX: using pre-prepared makefile for Linux
1 parent f06bdab commit d78caf6

File tree

1 file changed

+25
-30
lines changed

1 file changed

+25
-30
lines changed

make/makefile

+25-30
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REBOL Makefile -- Generated by make-make.r (do not edit) on 25-Oct-2017/17:18:42+2:00
1+
# REBOL Makefile -- Generated by make-make.r (do not edit) on 25-Oct-2017/23:16:40+2:00
22
# This makefile is intentional kept simple to make builds possible on
33
# a wider range of target platforms.
44

@@ -23,9 +23,9 @@ STRIP= $(TOOLS)strip
2323
# CP allows different copy progs:
2424
CP= cp
2525
# LS allows different ls progs:
26-
LS= dir
26+
LS= ls -l
2727
# RM allows different RM progs:
28-
RM= DEL /s /q
28+
RM= @-rm -rf
2929
# UP - some systems do not use ../
3030
UP= ..
3131
# CD - some systems do not use ./
@@ -39,22 +39,22 @@ R= $S/core
3939
INCL ?= .
4040
I= -I$(INCL) -I$S/include/
4141

42-
TO_OS?= TO_WIN32
43-
OS_ID?= 0.3.1
44-
BIN_SUFFIX= .exe
45-
LIB_SUFFIX= .dll
46-
RES= "objs/r3.res"
47-
RAPI_FLAGS= -O2 -DUNICODE -m32 -DENDIAN_LITTLE
48-
HOST_FLAGS= -DREB_EXE -O2 -DUNICODE -m32 -DENDIAN_LITTLE -D_FILE_OFFSET_BITS=64
42+
TO_OS?= TO_LINUX
43+
OS_ID?= 0.4.2
44+
BIN_SUFFIX=
45+
LIB_SUFFIX= .so
46+
RES=
47+
RAPI_FLAGS= -O2 -fPIC -DENDIAN_LITTLE
48+
HOST_FLAGS= -DREB_EXE -O2 -DENDIAN_LITTLE -D_FILE_OFFSET_BITS=64
4949
RLIB_FLAGS=
5050

5151
# Flags for core and for host:
5252
RFLAGS= -c -D$(TO_OS) -DREB_API $(RAPI_FLAGS) $I
5353
HFLAGS= -c -D$(TO_OS) -DREB_CORE $(HOST_FLAGS) $I
54-
CLIB= -m32 -lwsock32 -lcomdlg32 -mconsole -Wl,--stack=4194300 -lm
54+
CLIB= -ldl -lm
5555

5656
# REBOL is needed to build various include files:
57-
REBOL_TOOL= prebuild/r3-make-win.exe
57+
REBOL_TOOL= prebuild/r3-make-linux
5858
REBOL= $(CD)$(REBOL_TOOL) -qs
5959

6060
# For running tests, ship, build, etc.
@@ -79,7 +79,6 @@ all:
7979
$(MAKE) r3$(BIN_SUFFIX)
8080
$(MAKE) lib
8181
$(MAKE) host$(BIN_SUFFIX)
82-
$(MAKE) testdo
8382

8483
prep:
8584
$(REBOL) $T/make-headers.r
@@ -113,7 +112,7 @@ purge:
113112
$(MAKE) host$(BIN_SUFFIX)
114113

115114
testdo:
116-
r3$(BIN_SUFFIX) --do "print {^/^[[1;32m### I'm READY ###^[[0m^/}"
115+
$(CD)r3$(BIN_SUFFIX) --do "print {^/^[[1;32m### I'm READY ###^[[0m^/}"
117116

118117
test:
119118
$(CP) r3$(BIN_SUFFIX) $(UP)/src/tests/
@@ -162,14 +161,10 @@ OBJS = objs/a-constants.o objs/a-globals.o objs/a-lib.o objs/b-boot.o \
162161
objs/u-parse.o objs/u-png.o objs/u-sha1.o objs/u-zlib.o
163162

164163
HOST = objs/host-main.o objs/host-args.o objs/host-device.o objs/host-stdio.o \
165-
objs/dev-net.o objs/dev-dns.o objs/host-lib.o objs/dev-stdio.o \
166-
objs/dev-file.o objs/dev-event.o objs/dev-clipboard.o
164+
objs/dev-net.o objs/dev-dns.o objs/host-lib.o objs/host-readline.o \
165+
objs/dev-stdio.o objs/dev-event.o objs/dev-file.o
167166

168167

169-
# Compile resources:
170-
$(RES):
171-
$(TOOLS)windres r3.rc -O coff -o $(RES)
172-
173168
# Directly linked r3 executable:
174169
r3$(BIN_SUFFIX): tmps objs $(OBJS) $(HOST) $(RES)
175170
$(CC) -o r3$(BIN_SUFFIX) $(OBJS) $(HOST) $(RES) $(CLIB)
@@ -496,18 +491,18 @@ objs/dev-net.o: $S/os/dev-net.c
496491
objs/dev-dns.o: $S/os/dev-dns.c
497492
$(CC) $S/os/dev-dns.c $(HFLAGS) -o objs/dev-dns.o
498493

499-
objs/host-lib.o: $S/os/win32/host-lib.c
500-
$(CC) $S/os/win32/host-lib.c $(HFLAGS) -o objs/host-lib.o
494+
objs/host-lib.o: $S/os/posix/host-lib.c
495+
$(CC) $S/os/posix/host-lib.c $(HFLAGS) -o objs/host-lib.o
501496

502-
objs/dev-stdio.o: $S/os/win32/dev-stdio.c
503-
$(CC) $S/os/win32/dev-stdio.c $(HFLAGS) -o objs/dev-stdio.o
497+
objs/host-readline.o: $S/os/posix/host-readline.c
498+
$(CC) $S/os/posix/host-readline.c $(HFLAGS) -o objs/host-readline.o
504499

505-
objs/dev-file.o: $S/os/win32/dev-file.c
506-
$(CC) $S/os/win32/dev-file.c $(HFLAGS) -o objs/dev-file.o
500+
objs/dev-stdio.o: $S/os/posix/dev-stdio.c
501+
$(CC) $S/os/posix/dev-stdio.c $(HFLAGS) -o objs/dev-stdio.o
507502

508-
objs/dev-event.o: $S/os/win32/dev-event.c
509-
$(CC) $S/os/win32/dev-event.c $(HFLAGS) -o objs/dev-event.o
503+
objs/dev-event.o: $S/os/posix/dev-event.c
504+
$(CC) $S/os/posix/dev-event.c $(HFLAGS) -o objs/dev-event.o
510505

511-
objs/dev-clipboard.o: $S/os/win32/dev-clipboard.c
512-
$(CC) $S/os/win32/dev-clipboard.c $(HFLAGS) -o objs/dev-clipboard.o
506+
objs/dev-file.o: $S/os/posix/dev-file.c
507+
$(CC) $S/os/posix/dev-file.c $(HFLAGS) -o objs/dev-file.o
513508

0 commit comments

Comments
 (0)