File tree Expand file tree Collapse file tree 6 files changed +47
-4
lines changed Expand file tree Collapse file tree 6 files changed +47
-4
lines changed Original file line number Diff line number Diff line change @@ -42,6 +42,7 @@ extern const struct Resident
4242 Input_resident ,
4343 Intuition_resident ,
4444 X11Hidd_resident ,
45+ Cybergraphics_resident ,
4546 Console_resident ,
4647 Mathffp_resident ,
4748 Workbench_resident ,
@@ -74,6 +75,7 @@ static const struct Resident *romtagList[] =
7475 & Input_resident , /* ColdStart, 30 */
7576 & Intuition_resident , /* ColdStart, 10 */
7677 & X11Hidd_resident , /* ColdStart, 9 */
78+ & Cybergraphics_resident , /* ColdStart, 8 */
7779 & Console_resident , /* ColdStart, 5 */
7880 & emul_handler_resident , /* ColdStart, 0 */
7981 & boot_resident , /* ColdStart, -50 */
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ CFLAGS2 := $(SHARED_CFLAGS) -I/$(TOP)/rom/exec $(CFLAGS)
1818#MM kernel-keymap-linklib \
1919#MM kernel-mathffp-linklib kernel-mathieeesingbas-linklib \
2020#MM kernel-timer-linklib kernel-utility-freebsd kernel-oop-linklib \
21- #MM kernel-layers-linklib kernel-workbench-linklib
22-
21+ #MM kernel-layers-linklib kernel-workbench-linklib \
22+ #MM kernel-cgfx-linklib
2323
2424# Setup the CLIB metatargets...
2525#MM- setup-clib-freebsd : setup-clib-freebsd-i386
Original file line number Diff line number Diff line change @@ -43,6 +43,7 @@ extern const struct Resident
4343 Input_resident ,
4444 Intuition_resident ,
4545 X11Hidd_resident ,
46+ Cybergraphics_resident ,
4647 Console_resident ,
4748 Mathffp_resident ,
4849 Mathieeesingbas_resident ,
@@ -77,6 +78,7 @@ static const struct Resident *romtagList[] =
7778 & Input_resident , /* ColdStart, 30 */
7879 & Intuition_resident , /* ColdStart, 10 */
7980 & X11Hidd_resident , /* ColdStart, 9 */
81+ & Cybergraphics_resident , /* ColdStart, 8 */
8082 & Console_resident , /* ColdStart, 5 */
8183 & emul_handler_resident , /* ColdStart, 0 */
8284 & Workbench_resident , /* ColdStart, -120 */
Original file line number Diff line number Diff line change @@ -30,7 +30,8 @@ CFLAGS2 := $(SHARED_CFLAGS) -I/$(TOP)/rom/exec \
3030#MM kernel-battclock-linux \
3131#MM kernel-oop-linklib \
3232#MM kernel-layers-linklib \
33- #MM kernel-workbench-linklib
33+ #MM kernel-workbench-linklib \
34+ #MM kernel-cgfx-linklib
3435
3536# Setup the CLIB metatargets...
3637#MM- setup-clib-linux : setup-clib-linux-$(CPU)
Original file line number Diff line number Diff line change 1+ # Copyright (C) 1995-1998 AROS
2+ # $Id$
3+ #
4+ # Desc: Some options for the make
5+
6+ # DO NOT EDIT THIS FILE.
7+ # Instead create a file make.opts in the *same directory* and
8+ # put the options you need in there.
9+
10+ # Do we build the libraries shared (.so = yes) or static (.a = no)
11+ SHARED_EXEC = yes
12+ SHARED_DOS = yes
13+ SHARED_UTILITY = yes
14+ SHARED_GRAPHICS = yes
15+ SHARED_INTUITION = yes
16+ SHARED_LAYERS = yes
17+ SHARED_MATHFFP = yes
18+ SHARED_MATHIEEESINGBAS = yes
19+ SHARED_EXPANSION = yes
20+ SHARED_WORKBENCH = yes
21+ SHARED_BOOPSI = yes
22+ SHARED_AROS = yes
23+ SHARED_TIMER = yes
24+ SHARED_BATTCLOCK = yes
25+ SHARED_BOOT = yes
26+ SHARED_OOP = yes
27+ SHARED_CGFX = yes
28+
29+
30+ # Include debugging information (so you can use gdb or similar)
31+ DEBUG = yes
Original file line number Diff line number Diff line change @@ -132,6 +132,11 @@ DEPLIB_OOP=$(LIBDIR)/liboop.so
132132else
133133DEPLIB_OOP=$(LIBDIR)/liboop.a
134134endif
135+ ifeq ("$(SHARED_CGFX)","yes")
136+ DEPLIB_CGFX=$(LIBDIR)/libcybergraphics.so
137+ else
138+ DEPLIB_CGFX=$(LIBDIR)/libcybergraphics.a
139+ endif
135140
136141DEP_LIBS= $(DEPLIB_AMIGAOS) \
137142 $(GENDIR)/filesys/emul_handler.o \
@@ -153,6 +158,7 @@ DEP_LIBS= $(DEPLIB_AMIGAOS) \
153158 $(DEPLIB_BOOT) \
154159 $(DEPLIB_TIMER) \
155160 $(DEPLIB_BATTCLOCK) \
161+ $(DEPLIB_CGFX) \
156162 $(LIBDIR)/libconsole.a \
157163 $(LIBDIR)/libinput.a \
158164 $(LIBDIR)/libkeymap.a \
@@ -168,7 +174,8 @@ LIBS=-L$(LIBDIR) \
168174 -lhiddclass -lunixiocl -lboopsi -lutility -ltimer \
169175 -laros -lmathffp -lmathieeesingbas -lexpansion -lbattclock \
170176 -lamiga -larossupport -linput -lkeymap -loop -lx11cl \
171- -lhiddgraphicsstubs -lkeyboard -lgameport -lworkbench -lcon_handler
177+ -lhiddgraphicsstubs -lkeyboard -lgameport -lworkbench -lcon_handler \
178+ -lcybergraphics
172179
173180# BEGIN_DESC{internaltarget}
174181# \item{$(BINDIR)/arosshell} Create the AROS shell for systems which
You can’t perform that action at this time.
0 commit comments