From 31fadb4de119d10f4edb9b0d96b9f2dfa91b8616 Mon Sep 17 00:00:00 2001
From: nlorentz <nlorentz@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Sun, 2 Jan 2000 22:10:05 +0000
Subject: [PATCH] Added cybergfx

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@6674 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 arch/all-freebsd/exec/init.c   |  2 ++
 arch/all-freebsd/mmakefile.src |  4 ++--
 arch/all-linux/exec/init.c     |  2 ++
 arch/all-linux/mmakefile.src   |  3 ++-
 make.defaults                  | 31 +++++++++++++++++++++++++++++++
 mmakefile                      |  9 ++++++++-
 6 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 make.defaults

diff --git a/arch/all-freebsd/exec/init.c b/arch/all-freebsd/exec/init.c
index 7589bbe6f0..fdf13f3d4b 100644
--- a/arch/all-freebsd/exec/init.c
+++ b/arch/all-freebsd/exec/init.c
@@ -42,6 +42,7 @@ extern const struct Resident
     Input_resident,
     Intuition_resident,
     X11Hidd_resident,
+    Cybergraphics_resident,
     Console_resident,
     Mathffp_resident,
     Workbench_resident,
@@ -74,6 +75,7 @@ static const struct Resident *romtagList[] =
     &Input_resident,			    /* ColdStart,   30   */
     &Intuition_resident,                    /* ColdStart,   10   */
     &X11Hidd_resident,			    /* ColdStart,   9	 */
+    &Cybergraphics_resident,		    /* ColdStart,   8	 */
     &Console_resident,                      /* ColdStart,   5    */
     &emul_handler_resident,                 /* ColdStart,   0    */
     &boot_resident,			    /* ColdStart,  -50   */
diff --git a/arch/all-freebsd/mmakefile.src b/arch/all-freebsd/mmakefile.src
index 0275f65166..090d7149d3 100644
--- a/arch/all-freebsd/mmakefile.src
+++ b/arch/all-freebsd/mmakefile.src
@@ -18,8 +18,8 @@ CFLAGS2		:= $(SHARED_CFLAGS) -I/$(TOP)/rom/exec $(CFLAGS)
 #MM	kernel-keymap-linklib \
 #MM	kernel-mathffp-linklib kernel-mathieeesingbas-linklib \
 #MM	kernel-timer-linklib kernel-utility-freebsd kernel-oop-linklib \
-#MM     kernel-layers-linklib kernel-workbench-linklib
-
+#MM     kernel-layers-linklib kernel-workbench-linklib	\
+#MM	kernel-cgfx-linklib
 
 # Setup the CLIB metatargets...
 #MM- setup-clib-freebsd : setup-clib-freebsd-i386
diff --git a/arch/all-linux/exec/init.c b/arch/all-linux/exec/init.c
index 5c9dfcc0ca..7148ce5261 100644
--- a/arch/all-linux/exec/init.c
+++ b/arch/all-linux/exec/init.c
@@ -43,6 +43,7 @@ extern const struct Resident
     Input_resident,
     Intuition_resident,
     X11Hidd_resident,
+    Cybergraphics_resident,
     Console_resident,
     Mathffp_resident,
     Mathieeesingbas_resident,
@@ -77,6 +78,7 @@ static const struct Resident *romtagList[] =
     &Input_resident,			    /* ColdStart,   30	 */
     &Intuition_resident,		    /* ColdStart,   10	 */
     &X11Hidd_resident,			    /* ColdStart,   9	 */
+    &Cybergraphics_resident,		    /* ColdStart,   8	 */
     &Console_resident,			    /* ColdStart,   5	 */
     &emul_handler_resident,		    /* ColdStart,   0	 */
     &Workbench_resident,		    /* ColdStart,  -120  */
diff --git a/arch/all-linux/mmakefile.src b/arch/all-linux/mmakefile.src
index 37a1fcd807..04cf9fc98b 100644
--- a/arch/all-linux/mmakefile.src
+++ b/arch/all-linux/mmakefile.src
@@ -30,7 +30,8 @@ CFLAGS2 	:= $(SHARED_CFLAGS) -I/$(TOP)/rom/exec \
 #MM	    kernel-battclock-linux \
 #MM	    kernel-oop-linklib \
 #MM	    kernel-layers-linklib \
-#MM	    kernel-workbench-linklib
+#MM	    kernel-workbench-linklib \
+#MM	    kernel-cgfx-linklib
 
 # Setup the CLIB metatargets...
 #MM- setup-clib-linux : setup-clib-linux-$(CPU)
diff --git a/make.defaults b/make.defaults
new file mode 100644
index 0000000000..adcea9fc30
--- /dev/null
+++ b/make.defaults
@@ -0,0 +1,31 @@
+#   Copyright (C) 1995-1998 AROS
+#   $Id$
+#
+#   Desc: Some options for the make
+
+# DO NOT EDIT THIS FILE.
+# Instead create a file make.opts in the *same directory* and
+# put the options you need in there.
+
+# Do we build the libraries shared (.so = yes) or static (.a = no)
+SHARED_EXEC = yes
+SHARED_DOS = yes
+SHARED_UTILITY = yes
+SHARED_GRAPHICS = yes
+SHARED_INTUITION = yes
+SHARED_LAYERS = yes
+SHARED_MATHFFP = yes
+SHARED_MATHIEEESINGBAS = yes
+SHARED_EXPANSION = yes
+SHARED_WORKBENCH = yes
+SHARED_BOOPSI = yes
+SHARED_AROS = yes
+SHARED_TIMER = yes
+SHARED_BATTCLOCK = yes
+SHARED_BOOT = yes
+SHARED_OOP = yes
+SHARED_CGFX = yes
+
+
+# Include debugging information (so you can use gdb or similar)
+DEBUG = yes
diff --git a/mmakefile b/mmakefile
index 2cc6c74229..1cdb0ae0c9 100644
--- a/mmakefile
+++ b/mmakefile
@@ -132,6 +132,11 @@ DEPLIB_OOP=$(LIBDIR)/liboop.so
 else
 DEPLIB_OOP=$(LIBDIR)/liboop.a
 endif
+ifeq ("$(SHARED_CGFX)","yes")
+DEPLIB_CGFX=$(LIBDIR)/libcybergraphics.so
+else
+DEPLIB_CGFX=$(LIBDIR)/libcybergraphics.a
+endif
 
 DEP_LIBS= $(DEPLIB_AMIGAOS) \
     $(GENDIR)/filesys/emul_handler.o \
@@ -153,6 +158,7 @@ DEP_LIBS= $(DEPLIB_AMIGAOS) \
     $(DEPLIB_BOOT) \
     $(DEPLIB_TIMER) \
     $(DEPLIB_BATTCLOCK) \
+    $(DEPLIB_CGFX)	\
     $(LIBDIR)/libconsole.a \
     $(LIBDIR)/libinput.a \
     $(LIBDIR)/libkeymap.a \
@@ -168,7 +174,8 @@ LIBS=-L$(LIBDIR) \
 	-lhiddclass -lunixiocl -lboopsi -lutility -ltimer \
 	-laros -lmathffp -lmathieeesingbas -lexpansion -lbattclock \
 	-lamiga -larossupport -linput -lkeymap -loop -lx11cl \
-	-lhiddgraphicsstubs -lkeyboard -lgameport -lworkbench -lcon_handler
+	-lhiddgraphicsstubs -lkeyboard -lgameport -lworkbench -lcon_handler \
+	-lcybergraphics
 
 # BEGIN_DESC{internaltarget}
 # \item{$(BINDIR)/arosshell} Create the AROS shell for systems which