File tree 6 files changed +47
-4
lines changed
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
42
42
Input_resident ,
43
43
Intuition_resident ,
44
44
X11Hidd_resident ,
45
+ Cybergraphics_resident ,
45
46
Console_resident ,
46
47
Mathffp_resident ,
47
48
Workbench_resident ,
@@ -74,6 +75,7 @@ static const struct Resident *romtagList[] =
74
75
& Input_resident , /* ColdStart, 30 */
75
76
& Intuition_resident , /* ColdStart, 10 */
76
77
& X11Hidd_resident , /* ColdStart, 9 */
78
+ & Cybergraphics_resident , /* ColdStart, 8 */
77
79
& Console_resident , /* ColdStart, 5 */
78
80
& emul_handler_resident , /* ColdStart, 0 */
79
81
& 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)
18
18
#MM kernel-keymap-linklib \
19
19
#MM kernel-mathffp-linklib kernel-mathieeesingbas-linklib \
20
20
#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
23
23
24
24
# Setup the CLIB metatargets...
25
25
#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
43
43
Input_resident ,
44
44
Intuition_resident ,
45
45
X11Hidd_resident ,
46
+ Cybergraphics_resident ,
46
47
Console_resident ,
47
48
Mathffp_resident ,
48
49
Mathieeesingbas_resident ,
@@ -77,6 +78,7 @@ static const struct Resident *romtagList[] =
77
78
& Input_resident , /* ColdStart, 30 */
78
79
& Intuition_resident , /* ColdStart, 10 */
79
80
& X11Hidd_resident , /* ColdStart, 9 */
81
+ & Cybergraphics_resident , /* ColdStart, 8 */
80
82
& Console_resident , /* ColdStart, 5 */
81
83
& emul_handler_resident , /* ColdStart, 0 */
82
84
& 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 \
30
30
#MM kernel-battclock-linux \
31
31
#MM kernel-oop-linklib \
32
32
#MM kernel-layers-linklib \
33
- #MM kernel-workbench-linklib
33
+ #MM kernel-workbench-linklib \
34
+ #MM kernel-cgfx-linklib
34
35
35
36
# Setup the CLIB metatargets...
36
37
#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
132
132
else
133
133
DEPLIB_OOP=$(LIBDIR)/liboop.a
134
134
endif
135
+ ifeq ("$(SHARED_CGFX)","yes")
136
+ DEPLIB_CGFX=$(LIBDIR)/libcybergraphics.so
137
+ else
138
+ DEPLIB_CGFX=$(LIBDIR)/libcybergraphics.a
139
+ endif
135
140
136
141
DEP_LIBS= $(DEPLIB_AMIGAOS) \
137
142
$(GENDIR)/filesys/emul_handler.o \
@@ -153,6 +158,7 @@ DEP_LIBS= $(DEPLIB_AMIGAOS) \
153
158
$(DEPLIB_BOOT) \
154
159
$(DEPLIB_TIMER) \
155
160
$(DEPLIB_BATTCLOCK) \
161
+ $(DEPLIB_CGFX) \
156
162
$(LIBDIR)/libconsole.a \
157
163
$(LIBDIR)/libinput.a \
158
164
$(LIBDIR)/libkeymap.a \
@@ -168,7 +174,8 @@ LIBS=-L$(LIBDIR) \
168
174
-lhiddclass -lunixiocl -lboopsi -lutility -ltimer \
169
175
-laros -lmathffp -lmathieeesingbas -lexpansion -lbattclock \
170
176
-lamiga -larossupport -linput -lkeymap -loop -lx11cl \
171
- -lhiddgraphicsstubs -lkeyboard -lgameport -lworkbench -lcon_handler
177
+ -lhiddgraphicsstubs -lkeyboard -lgameport -lworkbench -lcon_handler \
178
+ -lcybergraphics
172
179
173
180
# BEGIN_DESC{internaltarget}
174
181
# \item{$(BINDIR)/arosshell} Create the AROS shell for systems which
You can’t perform that action at this time.
0 commit comments