diff --git a/.gitattributes b/.gitattributes index caaa9eaf85..4ad3202340 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2847,7 +2847,6 @@ packages/extra/opengl/glut.pp svneol=native#text/plain packages/extra/opengl/glx.pp svneol=native#text/plain packages/extra/opengl/readme -text packages/extra/opengl/tinygl.inc -text -packages/extra/opengl/tinygl.pp -text packages/extra/opengl/tinyglh.inc -text packages/extra/os2units/Makefile svneol=native#text/plain packages/extra/os2units/Makefile.fpc svneol=native#text/plain @@ -3795,6 +3794,7 @@ rtl/morphos/sysutils.pp svneol=native#text/plain rtl/morphos/timer.pp svneol=native#text/plain rtl/morphos/timerd.inc svneol=native#text/plain rtl/morphos/timerf.inc svneol=native#text/plain +rtl/morphos/tinygl.pp -text rtl/morphos/tthread.inc svneol=native#text/plain rtl/morphos/utild1.inc svneol=native#text/plain rtl/morphos/utild2.inc svneol=native#text/plain diff --git a/packages/extra/opengl/Makefile b/packages/extra/opengl/Makefile index 310ee25a7a..8a6041f290 100644 --- a/packages/extra/opengl/Makefile +++ b/packages/extra/opengl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/20] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/25] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux @@ -233,115 +233,115 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext override PACKAGE_NAME=opengl override PACKAGE_VERSION=2.0.0 ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut glext endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=gl glu glut glext +override TARGET_UNITS+=gl glu glut endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=gl glu glut glext dllfuncs glx +override TARGET_UNITS+=gl glu glut dllfuncs glx glext endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_EXAMPLEDIRS+=examples diff --git a/packages/extra/opengl/Makefile.fpc b/packages/extra/opengl/Makefile.fpc index 41a5822d4a..944a3aa008 100644 --- a/packages/extra/opengl/Makefile.fpc +++ b/packages/extra/opengl/Makefile.fpc @@ -14,12 +14,13 @@ packages_openbsd=x11 packages_darwin=x11 [target] -units=gl glu glut glext -units_linux=dllfuncs glx -units_freebsd=dllfuncs glx -units_netbsd=dllfuncs glx -units_openbsd=dllfuncs glx -units_darwin=dllfuncs glx +units=gl glu glut +units_win32=glext +units_linux=dllfuncs glx glext +units_freebsd=dllfuncs glx glext +units_netbsd=dllfuncs glx glext +units_openbsd=dllfuncs glx glext +units_darwin=dllfuncs glx glext exampledirs=examples [install] diff --git a/packages/extra/opengl/gl.pp b/packages/extra/opengl/gl.pp index 244c51ae6f..7f2dfe9d72 100644 --- a/packages/extra/opengl/gl.pp +++ b/packages/extra/opengl/gl.pp @@ -49,6 +49,7 @@ Abstract: {$ELSE} {$DEFINE extdecl := cdecl} {$IFDEF MorphOS} + {$INLINE ON} {$DEFINE GL_UNIT} {$ELSE} {$LINKLIB c} diff --git a/packages/extra/opengl/glu.pp b/packages/extra/opengl/glu.pp index 079aaacc9a..85e825fa5d 100644 --- a/packages/extra/opengl/glu.pp +++ b/packages/extra/opengl/glu.pp @@ -61,6 +61,7 @@ Abstract: {$ENDIF} {$IFDEF MORPHOS} +{$INLINE ON} {$DEFINE GLU_UNIT} {$ENDIF} diff --git a/packages/extra/opengl/glut.pp b/packages/extra/opengl/glut.pp index 6fa5be6a01..a5794e1509 100644 --- a/packages/extra/opengl/glut.pp +++ b/packages/extra/opengl/glut.pp @@ -14,6 +14,7 @@ {$ENDIF} {$IFDEF MORPHOS} +{$INLINE ON} {$DEFINE GLUT_UNIT} {$ENDIF} diff --git a/packages/extra/opengl/tinygl.inc b/packages/extra/opengl/tinygl.inc index 78fb3a9cc0..d874b18b6f 100644 --- a/packages/extra/opengl/tinygl.inc +++ b/packages/extra/opengl/tinygl.inc @@ -1,3 +1,21 @@ +{ + This file is part of the Free Pascal run time library. + Copyright (c) 2005 by Karoly Balogh + + TinyGL/OpenGL wrapper include for MorphOS/PowerPC + + Thanks to Michal 'kiero' Wozniak and Mark 'bigfoot' Olsen + for their help. + + See the file COPYING.FPC, included in this distribution, + for details about the copyright. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + **********************************************************************} + { ****************************************************************************************************** } { ** TinyGL syscalls ** } { ****************************************************************************************************** } diff --git a/packages/extra/opengl/tinyglh.inc b/packages/extra/opengl/tinyglh.inc index 6827a3a808..6ff3852eb7 100644 --- a/packages/extra/opengl/tinyglh.inc +++ b/packages/extra/opengl/tinyglh.inc @@ -1,3 +1,20 @@ +{ + This file is part of the Free Pascal run time library. + Copyright (c) 2005 by Karoly Balogh + + TinyGL/OpenGL wrapper include header for MorphOS/PowerPC + + Thanks to Michal 'kiero' Wozniak and Mark 'bigfoot' Olsen + for their help. + + See the file COPYING.FPC, included in this distribution, + for details about the copyright. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + **********************************************************************} { ****************************************************************************************************** } { ** GL functions ** } diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile index 92b3bdb2e0..4c15657726 100644 --- a/rtl/morphos/Makefile +++ b/rtl/morphos/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/20] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/25] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux @@ -246,115 +246,115 @@ endif OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition clipboard datatypes asl ahi get9 fpmkunit +override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas strings dos sysutils classes math typinfo varutils charset ucomplex getopts matrix variants types rtlconsts sysconst dateutil exec timer doslib utility hardware inputevent graphics layers intuition aboxlib clipboard datatypes asl ahi get9 tinygl fpmkunit endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 @@ -2070,7 +2070,11 @@ graphics$(PPUEXT): graphics.pas exec$(PPUEXT) utility$(PPUEXT) hardware$(PPUEXT) layers$(PPUEXT) : layers.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) intuition$(PPUEXT): intuition.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) \ inputevent$(PPUEXT) timer$(PPUEXT) layers$(PPUEXT) +aboxlib$(PPUEXT): aboxlib.pas clipboard$(PPUEXT): clipboard.pas exec$(PPUEXT) +datatype$(PPUEXT): datatypes.pas exec$(PPUEXT) doslib$(PPUEXT) intuition$(PPUEXT) \ + utility$(PPUEXT) graphics$(PPUEXT) asl$(PPUEXT): asl.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) ahi$(PPUEXT): ahi.pas exec$(PPUEXT) utility$(PPUEXT) get9$(PPUEXT): get9.pas exec$(PPUEXT) +tinygl$(PPUEXT): tinygl.pp exec$(PPUEXT) diff --git a/rtl/morphos/Makefile.fpc b/rtl/morphos/Makefile.fpc index 159e503c85..efa35c074b 100644 --- a/rtl/morphos/Makefile.fpc +++ b/rtl/morphos/Makefile.fpc @@ -13,7 +13,7 @@ units=$(SYSTEMUNIT) objpas macpas strings \ charset ucomplex getopts matrix \ variants types rtlconsts sysconst dateutil \ exec timer doslib utility hardware inputevent graphics layers \ - intuition aboxlib clipboard datatypes asl ahi get9 \ + intuition aboxlib clipboard datatypes asl ahi get9 tinygl \ fpmkunit rsts=math rtlconsts varutils typinfo variants classes sysconst dateutil fpmkunit @@ -206,3 +206,5 @@ asl$(PPUEXT): asl.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) ahi$(PPUEXT): ahi.pas exec$(PPUEXT) utility$(PPUEXT) get9$(PPUEXT): get9.pas exec$(PPUEXT) + +tinygl$(PPUEXT): tinygl.pp exec$(PPUEXT) diff --git a/packages/extra/opengl/tinygl.pp b/rtl/morphos/tinygl.pp similarity index 100% rename from packages/extra/opengl/tinygl.pp rename to rtl/morphos/tinygl.pp