mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-05-28 11:22:56 +02:00
renamed gtkglarea.pp to gtkglarecontrol.pas
git-svn-id: trunk@4952 -
This commit is contained in:
parent
459b1c939c
commit
0c15e751c5
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -47,8 +47,8 @@ components/codetools/sourcechanger.pas svneol=native#text/pascal
|
|||||||
components/codetools/sourcelog.pas svneol=native#text/pascal
|
components/codetools/sourcelog.pas svneol=native#text/pascal
|
||||||
components/codetools/stdcodetools.pas svneol=native#text/pascal
|
components/codetools/stdcodetools.pas svneol=native#text/pascal
|
||||||
components/gtk/gtkglarea/gtkglarea.lrs svneol=native#text/pascal
|
components/gtk/gtkglarea/gtkglarea.lrs svneol=native#text/pascal
|
||||||
components/gtk/gtkglarea/gtkglarea.pp svneol=native#text/pascal
|
|
||||||
components/gtk/gtkglarea/gtkglarea_int.pp svneol=native#text/pascal
|
components/gtk/gtkglarea/gtkglarea_int.pp svneol=native#text/pascal
|
||||||
|
components/gtk/gtkglarea/gtkglareacontrol.pas svneol=native#text/pascal
|
||||||
components/gtk/gtkglarea/gtkopengl.lpk svneol=native#text/pascal
|
components/gtk/gtkglarea/gtkopengl.lpk svneol=native#text/pascal
|
||||||
components/gtk/gtkglarea/gtkopengl.pas svneol=native#text/pascal
|
components/gtk/gtkglarea/gtkopengl.pas svneol=native#text/pascal
|
||||||
components/gtk/gtkglarea/nvgl.pp svneol=native#text/pascal
|
components/gtk/gtkglarea/nvgl.pp svneol=native#text/pascal
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#
|
#
|
||||||
# Don't edit, this file is generated by FPCMake Version 1.1 [2003/06/05]
|
# Don't edit, this file is generated by FPCMake Version 1.1 [2003/12/21]
|
||||||
#
|
#
|
||||||
default: all
|
default: all
|
||||||
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx
|
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
|
||||||
override PATH:=$(subst \,/,$(PATH))
|
override PATH:=$(subst \,/,$(PATH))
|
||||||
ifeq ($(findstring ;,$(PATH)),)
|
ifeq ($(findstring ;,$(PATH)),)
|
||||||
inUnix=1
|
inUnix=1
|
||||||
@ -10,6 +10,7 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
|
|||||||
else
|
else
|
||||||
SEARCHPATH:=$(subst ;, ,$(PATH))
|
SEARCHPATH:=$(subst ;, ,$(PATH))
|
||||||
endif
|
endif
|
||||||
|
SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
|
||||||
PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
|
PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
|
||||||
ifeq ($(PWD),)
|
ifeq ($(PWD),)
|
||||||
PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
|
PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
|
||||||
@ -205,7 +206,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext
|
|||||||
override PACKAGE_NAME=gtkopengl
|
override PACKAGE_NAME=gtkopengl
|
||||||
override PACKAGE_VERSION=1.0
|
override PACKAGE_VERSION=1.0
|
||||||
override TARGET_UNITS+=gtkglarea
|
override TARGET_UNITS+=gtkglarea
|
||||||
override TARGET_IMPLICITUNITS+=gtkglarea_int nvgl gtkglarea
|
override TARGET_IMPLICITUNITS+=gtkglarea_int nvgl gtkglareacontrol
|
||||||
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
|
||||||
override DIST_ZIPNAME=lazarus.gtkglarea.$(ZIPSUFFIX)
|
override DIST_ZIPNAME=lazarus.gtkglarea.$(ZIPSUFFIX)
|
||||||
override COMPILER_OPTIONS+=-gl -k-lGL
|
override COMPILER_OPTIONS+=-gl -k-lGL
|
||||||
@ -292,9 +293,17 @@ endif
|
|||||||
endif
|
endif
|
||||||
ifndef INSTALL_BINDIR
|
ifndef INSTALL_BINDIR
|
||||||
ifdef UNIXINSTALLDIR
|
ifdef UNIXINSTALLDIR
|
||||||
|
ifdef CROSSCOMPILE
|
||||||
|
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
|
||||||
|
else
|
||||||
INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
|
INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
ifdef CROSSCOMPILE
|
||||||
|
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
|
||||||
else
|
else
|
||||||
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
|
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
|
||||||
|
endif
|
||||||
ifdef INSTALL_FPCPACKAGE
|
ifdef INSTALL_FPCPACKAGE
|
||||||
INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
|
INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
|
||||||
endif
|
endif
|
||||||
@ -403,16 +412,16 @@ endif
|
|||||||
else
|
else
|
||||||
CROSSBINDIR=
|
CROSSBINDIR=
|
||||||
endif
|
endif
|
||||||
ifdef inUnix
|
ifeq ($(OS_SOURCE),linux)
|
||||||
ifndef GCCLIBDIR
|
ifndef GCCLIBDIR
|
||||||
GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
|
GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),linux)
|
|
||||||
ifndef OTHERLIBDIR
|
ifndef OTHERLIBDIR
|
||||||
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
|
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),netbsd)
|
ifdef inUnix
|
||||||
|
ifeq ($(OS_SOURCE),netbsd)
|
||||||
OTHERLIBDIR+=/usr/pkg/lib
|
OTHERLIBDIR+=/usr/pkg/lib
|
||||||
endif
|
endif
|
||||||
export GCCLIBDIR OTHERLIB
|
export GCCLIBDIR OTHERLIB
|
||||||
@ -440,6 +449,14 @@ STATICLIBPREFIX=
|
|||||||
FPCMADE=fpcmade.dos
|
FPCMADE=fpcmade.dos
|
||||||
ZIPSUFFIX=go32
|
ZIPSUFFIX=go32
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS_TARGET),watcom)
|
||||||
|
STATICLIBPREFIX=
|
||||||
|
FPCMADE=fpcmade.wat
|
||||||
|
ZIPSUFFIX=watc
|
||||||
|
OEXT=.obj
|
||||||
|
ASMEXT=.asm
|
||||||
|
SHAREDLIBEXT=.dll
|
||||||
|
endif
|
||||||
ifeq ($(OS_TARGET),linux)
|
ifeq ($(OS_TARGET),linux)
|
||||||
EXEEXT=
|
EXEEXT=
|
||||||
HASSHAREDLIB=1
|
HASSHAREDLIB=1
|
||||||
@ -542,6 +559,11 @@ STATICLIBPREFIX=
|
|||||||
FPCMADE=fpcmade.dos
|
FPCMADE=fpcmade.dos
|
||||||
ZIPSUFFIX=go32
|
ZIPSUFFIX=go32
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS_TARGET),watcom)
|
||||||
|
STATICLIBPREFIX=
|
||||||
|
FPCMADE=fpcmade.dos
|
||||||
|
ZIPSUFFIX=watcom
|
||||||
|
endif
|
||||||
ifeq ($(OS_TARGET),linux)
|
ifeq ($(OS_TARGET),linux)
|
||||||
EXEEXT=
|
EXEEXT=
|
||||||
HASSHAREDLIB=1
|
HASSHAREDLIB=1
|
||||||
@ -730,7 +752,11 @@ endif
|
|||||||
endif
|
endif
|
||||||
export MVPROG
|
export MVPROG
|
||||||
ifndef ECHOREDIR
|
ifndef ECHOREDIR
|
||||||
ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
|
ifndef inUnix
|
||||||
|
ECHOREDIR=echo
|
||||||
|
else
|
||||||
|
ECHOREDIR=$(ECHO)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
ifndef COPY
|
ifndef COPY
|
||||||
COPY:=$(CPPROG) -fp
|
COPY:=$(CPPROG) -fp
|
||||||
@ -801,14 +827,16 @@ TARPROG:=$(firstword $(TARPROG))
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
export TARPROG
|
export TARPROG
|
||||||
|
ASNAME=$(BINUTILSPREFIX)as
|
||||||
|
LDNAME=$(BINUTILSPREFIX)ld
|
||||||
|
ARNAME=$(BINUTILSPREFIX)ar
|
||||||
|
RCNAME=$(BINUTILSPREFIX)rc
|
||||||
|
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
|
||||||
|
ifeq ($(OS_TARGET),win32)
|
||||||
ASNAME=as
|
ASNAME=as
|
||||||
LDNAME=ld
|
LDNAME=ld
|
||||||
ARNAME=ar
|
ARNAME=ar
|
||||||
RCNAME=rc
|
endif
|
||||||
ifeq ($(OS_TARGET),win32)
|
|
||||||
ASNAME=asw
|
|
||||||
LDNAME=ldw
|
|
||||||
ARNAME=arw
|
|
||||||
endif
|
endif
|
||||||
ifndef ASPROG
|
ifndef ASPROG
|
||||||
ifdef CROSSBINDIR
|
ifdef CROSSBINDIR
|
||||||
@ -888,12 +916,14 @@ REQUIRE_PACKAGES_RTL=1
|
|||||||
REQUIRE_PACKAGES_PASZLIB=1
|
REQUIRE_PACKAGES_PASZLIB=1
|
||||||
REQUIRE_PACKAGES_NETDB=1
|
REQUIRE_PACKAGES_NETDB=1
|
||||||
REQUIRE_PACKAGES_LIBASYNC=1
|
REQUIRE_PACKAGES_LIBASYNC=1
|
||||||
|
REQUIRE_PACKAGES_PTHREADS=1
|
||||||
REQUIRE_PACKAGES_FCL=1
|
REQUIRE_PACKAGES_FCL=1
|
||||||
REQUIRE_PACKAGES_GTK=1
|
REQUIRE_PACKAGES_GTK=1
|
||||||
REQUIRE_PACKAGES_X11=1
|
REQUIRE_PACKAGES_X11=1
|
||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),linux)
|
ifeq ($(OS_TARGET),linux)
|
||||||
@ -902,12 +932,14 @@ REQUIRE_PACKAGES_RTL=1
|
|||||||
REQUIRE_PACKAGES_PASZLIB=1
|
REQUIRE_PACKAGES_PASZLIB=1
|
||||||
REQUIRE_PACKAGES_NETDB=1
|
REQUIRE_PACKAGES_NETDB=1
|
||||||
REQUIRE_PACKAGES_LIBASYNC=1
|
REQUIRE_PACKAGES_LIBASYNC=1
|
||||||
|
REQUIRE_PACKAGES_PTHREADS=1
|
||||||
REQUIRE_PACKAGES_FCL=1
|
REQUIRE_PACKAGES_FCL=1
|
||||||
REQUIRE_PACKAGES_GTK=1
|
REQUIRE_PACKAGES_GTK=1
|
||||||
REQUIRE_PACKAGES_X11=1
|
REQUIRE_PACKAGES_X11=1
|
||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),linux)
|
ifeq ($(OS_TARGET),linux)
|
||||||
@ -916,12 +948,14 @@ REQUIRE_PACKAGES_RTL=1
|
|||||||
REQUIRE_PACKAGES_PASZLIB=1
|
REQUIRE_PACKAGES_PASZLIB=1
|
||||||
REQUIRE_PACKAGES_NETDB=1
|
REQUIRE_PACKAGES_NETDB=1
|
||||||
REQUIRE_PACKAGES_LIBASYNC=1
|
REQUIRE_PACKAGES_LIBASYNC=1
|
||||||
|
REQUIRE_PACKAGES_PTHREADS=1
|
||||||
REQUIRE_PACKAGES_FCL=1
|
REQUIRE_PACKAGES_FCL=1
|
||||||
REQUIRE_PACKAGES_GTK=1
|
REQUIRE_PACKAGES_GTK=1
|
||||||
REQUIRE_PACKAGES_X11=1
|
REQUIRE_PACKAGES_X11=1
|
||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),linux)
|
ifeq ($(OS_TARGET),linux)
|
||||||
@ -930,12 +964,14 @@ REQUIRE_PACKAGES_RTL=1
|
|||||||
REQUIRE_PACKAGES_PASZLIB=1
|
REQUIRE_PACKAGES_PASZLIB=1
|
||||||
REQUIRE_PACKAGES_NETDB=1
|
REQUIRE_PACKAGES_NETDB=1
|
||||||
REQUIRE_PACKAGES_LIBASYNC=1
|
REQUIRE_PACKAGES_LIBASYNC=1
|
||||||
|
REQUIRE_PACKAGES_PTHREADS=1
|
||||||
REQUIRE_PACKAGES_FCL=1
|
REQUIRE_PACKAGES_FCL=1
|
||||||
REQUIRE_PACKAGES_GTK=1
|
REQUIRE_PACKAGES_GTK=1
|
||||||
REQUIRE_PACKAGES_X11=1
|
REQUIRE_PACKAGES_X11=1
|
||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),linux)
|
ifeq ($(OS_TARGET),linux)
|
||||||
@ -944,12 +980,14 @@ REQUIRE_PACKAGES_RTL=1
|
|||||||
REQUIRE_PACKAGES_PASZLIB=1
|
REQUIRE_PACKAGES_PASZLIB=1
|
||||||
REQUIRE_PACKAGES_NETDB=1
|
REQUIRE_PACKAGES_NETDB=1
|
||||||
REQUIRE_PACKAGES_LIBASYNC=1
|
REQUIRE_PACKAGES_LIBASYNC=1
|
||||||
|
REQUIRE_PACKAGES_PTHREADS=1
|
||||||
REQUIRE_PACKAGES_FCL=1
|
REQUIRE_PACKAGES_FCL=1
|
||||||
REQUIRE_PACKAGES_GTK=1
|
REQUIRE_PACKAGES_GTK=1
|
||||||
REQUIRE_PACKAGES_X11=1
|
REQUIRE_PACKAGES_X11=1
|
||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),go32v2)
|
ifeq ($(OS_TARGET),go32v2)
|
||||||
@ -973,6 +1011,7 @@ REQUIRE_PACKAGES_GTK=1
|
|||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
REQUIRE_PACKAGES_LIBASYNC=1
|
REQUIRE_PACKAGES_LIBASYNC=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@ -993,12 +1032,14 @@ REQUIRE_PACKAGES_RTL=1
|
|||||||
REQUIRE_PACKAGES_PASZLIB=1
|
REQUIRE_PACKAGES_PASZLIB=1
|
||||||
REQUIRE_PACKAGES_NETDB=1
|
REQUIRE_PACKAGES_NETDB=1
|
||||||
REQUIRE_PACKAGES_LIBASYNC=1
|
REQUIRE_PACKAGES_LIBASYNC=1
|
||||||
|
REQUIRE_PACKAGES_PTHREADS=1
|
||||||
REQUIRE_PACKAGES_FCL=1
|
REQUIRE_PACKAGES_FCL=1
|
||||||
REQUIRE_PACKAGES_GTK=1
|
REQUIRE_PACKAGES_GTK=1
|
||||||
REQUIRE_PACKAGES_X11=1
|
REQUIRE_PACKAGES_X11=1
|
||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),freebsd)
|
ifeq ($(OS_TARGET),freebsd)
|
||||||
@ -1007,12 +1048,14 @@ REQUIRE_PACKAGES_RTL=1
|
|||||||
REQUIRE_PACKAGES_PASZLIB=1
|
REQUIRE_PACKAGES_PASZLIB=1
|
||||||
REQUIRE_PACKAGES_NETDB=1
|
REQUIRE_PACKAGES_NETDB=1
|
||||||
REQUIRE_PACKAGES_LIBASYNC=1
|
REQUIRE_PACKAGES_LIBASYNC=1
|
||||||
|
REQUIRE_PACKAGES_PTHREADS=1
|
||||||
REQUIRE_PACKAGES_FCL=1
|
REQUIRE_PACKAGES_FCL=1
|
||||||
REQUIRE_PACKAGES_GTK=1
|
REQUIRE_PACKAGES_GTK=1
|
||||||
REQUIRE_PACKAGES_X11=1
|
REQUIRE_PACKAGES_X11=1
|
||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),beos)
|
ifeq ($(OS_TARGET),beos)
|
||||||
@ -1038,6 +1081,7 @@ REQUIRE_PACKAGES_X11=1
|
|||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),netbsd)
|
ifeq ($(OS_TARGET),netbsd)
|
||||||
@ -1052,6 +1096,7 @@ REQUIRE_PACKAGES_X11=1
|
|||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),amiga)
|
ifeq ($(OS_TARGET),amiga)
|
||||||
@ -1132,6 +1177,7 @@ REQUIRE_PACKAGES_X11=1
|
|||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),openbsd)
|
ifeq ($(OS_TARGET),openbsd)
|
||||||
@ -1146,6 +1192,7 @@ REQUIRE_PACKAGES_X11=1
|
|||||||
REQUIRE_PACKAGES_OPENGL=1
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
REQUIRE_PACKAGES_MYSQL=1
|
REQUIRE_PACKAGES_MYSQL=1
|
||||||
REQUIRE_PACKAGES_IBASE=1
|
REQUIRE_PACKAGES_IBASE=1
|
||||||
|
REQUIRE_PACKAGES_SQLITE=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(OS_TARGET),wdosx)
|
ifeq ($(OS_TARGET),wdosx)
|
||||||
@ -1203,6 +1250,17 @@ REQUIRE_PACKAGES_NETDB=1
|
|||||||
REQUIRE_PACKAGES_LIBASYNC=1
|
REQUIRE_PACKAGES_LIBASYNC=1
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(OS_TARGET),watcom)
|
||||||
|
ifeq ($(CPU_TARGET),i386)
|
||||||
|
REQUIRE_PACKAGES_RTL=1
|
||||||
|
REQUIRE_PACKAGES_PASZLIB=1
|
||||||
|
REQUIRE_PACKAGES_FCL=1
|
||||||
|
REQUIRE_PACKAGES_GTK=1
|
||||||
|
REQUIRE_PACKAGES_OPENGL=1
|
||||||
|
REQUIRE_PACKAGES_NETDB=1
|
||||||
|
REQUIRE_PACKAGES_LIBASYNC=1
|
||||||
|
endif
|
||||||
|
endif
|
||||||
ifdef REQUIRE_PACKAGES_RTL
|
ifdef REQUIRE_PACKAGES_RTL
|
||||||
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
|
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
|
||||||
ifneq ($(PACKAGEDIR_RTL),)
|
ifneq ($(PACKAGEDIR_RTL),)
|
||||||
@ -1307,6 +1365,32 @@ ifdef UNITDIR_LIBASYNC
|
|||||||
override COMPILER_UNITDIR+=$(UNITDIR_LIBASYNC)
|
override COMPILER_UNITDIR+=$(UNITDIR_LIBASYNC)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
ifdef REQUIRE_PACKAGES_PTHREADS
|
||||||
|
PACKAGEDIR_PTHREADS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Makefile.fpc,$(PACKAGESDIR))))))
|
||||||
|
ifneq ($(PACKAGEDIR_PTHREADS),)
|
||||||
|
ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/$(OS_TARGET)),)
|
||||||
|
UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/$(OS_TARGET)
|
||||||
|
else
|
||||||
|
UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)
|
||||||
|
endif
|
||||||
|
ifdef CHECKDEPEND
|
||||||
|
$(PACKAGEDIR_PTHREADS)/$(FPCMADE):
|
||||||
|
$(MAKE) -C $(PACKAGEDIR_PTHREADS) $(FPCMADE)
|
||||||
|
override ALLDEPENDENCIES+=$(PACKAGEDIR_PTHREADS)/$(FPCMADE)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
PACKAGEDIR_PTHREADS=
|
||||||
|
UNITDIR_PTHREADS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Package.fpc,$(UNITSDIR)))))
|
||||||
|
ifneq ($(UNITDIR_PTHREADS),)
|
||||||
|
UNITDIR_PTHREADS:=$(firstword $(UNITDIR_PTHREADS))
|
||||||
|
else
|
||||||
|
UNITDIR_PTHREADS=
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifdef UNITDIR_PTHREADS
|
||||||
|
override COMPILER_UNITDIR+=$(UNITDIR_PTHREADS)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
ifdef REQUIRE_PACKAGES_FCL
|
ifdef REQUIRE_PACKAGES_FCL
|
||||||
PACKAGEDIR_FCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
|
PACKAGEDIR_FCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
|
||||||
ifneq ($(PACKAGEDIR_FCL),)
|
ifneq ($(PACKAGEDIR_FCL),)
|
||||||
@ -1463,6 +1547,32 @@ ifdef UNITDIR_IBASE
|
|||||||
override COMPILER_UNITDIR+=$(UNITDIR_IBASE)
|
override COMPILER_UNITDIR+=$(UNITDIR_IBASE)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
ifdef REQUIRE_PACKAGES_SQLITE
|
||||||
|
PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR))))))
|
||||||
|
ifneq ($(PACKAGEDIR_SQLITE),)
|
||||||
|
ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/$(OS_TARGET)),)
|
||||||
|
UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/$(OS_TARGET)
|
||||||
|
else
|
||||||
|
UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)
|
||||||
|
endif
|
||||||
|
ifdef CHECKDEPEND
|
||||||
|
$(PACKAGEDIR_SQLITE)/$(FPCMADE):
|
||||||
|
$(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE)
|
||||||
|
override ALLDEPENDENCIES+=$(PACKAGEDIR_SQLITE)/$(FPCMADE)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
PACKAGEDIR_SQLITE=
|
||||||
|
UNITDIR_SQLITE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Package.fpc,$(UNITSDIR)))))
|
||||||
|
ifneq ($(UNITDIR_SQLITE),)
|
||||||
|
UNITDIR_SQLITE:=$(firstword $(UNITDIR_SQLITE))
|
||||||
|
else
|
||||||
|
UNITDIR_SQLITE=
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
ifdef UNITDIR_SQLITE
|
||||||
|
override COMPILER_UNITDIR+=$(UNITDIR_SQLITE)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
ifndef NOCPUDEF
|
ifndef NOCPUDEF
|
||||||
override FPCOPTDEF=$(CPU_TARGET)
|
override FPCOPTDEF=$(CPU_TARGET)
|
||||||
endif
|
endif
|
||||||
@ -1472,6 +1582,14 @@ endif
|
|||||||
ifeq ($(OS_SOURCE),openbsd)
|
ifeq ($(OS_SOURCE),openbsd)
|
||||||
override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
|
override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
|
||||||
endif
|
endif
|
||||||
|
ifndef CROSSBOOTSTRAP
|
||||||
|
ifneq ($(BINUTILSPREFIX),)
|
||||||
|
override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
|
||||||
|
endif
|
||||||
|
ifneq ($(BINUTILSPREFIX),)
|
||||||
|
override FPCOPT+=-Xr$(RLINKPATH)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
ifdef UNITDIR
|
ifdef UNITDIR
|
||||||
override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
|
override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
|
||||||
endif
|
endif
|
||||||
@ -1609,7 +1727,7 @@ fpc_debug:
|
|||||||
$(MAKE) all DEBUG=1
|
$(MAKE) all DEBUG=1
|
||||||
fpc_release:
|
fpc_release:
|
||||||
$(MAKE) all RELEASE=1
|
$(MAKE) all RELEASE=1
|
||||||
.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res
|
.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res
|
||||||
%$(PPUEXT): %.pp
|
%$(PPUEXT): %.pp
|
||||||
$(COMPILER) $<
|
$(COMPILER) $<
|
||||||
$(EXECPPAS)
|
$(EXECPPAS)
|
||||||
@ -1622,10 +1740,14 @@ fpc_release:
|
|||||||
%$(EXEEXT): %.pas
|
%$(EXEEXT): %.pas
|
||||||
$(COMPILER) $<
|
$(COMPILER) $<
|
||||||
$(EXECPPAS)
|
$(EXECPPAS)
|
||||||
|
%$(EXEEXT): %.dpr
|
||||||
|
$(COMPILER) $<
|
||||||
|
$(EXECPPAS)
|
||||||
%.res: %.rc
|
%.res: %.rc
|
||||||
windres -i $< -o $@
|
windres -i $< -o $@
|
||||||
vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
|
vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
|
||||||
vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
|
vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
|
||||||
|
vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
|
||||||
vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
|
vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
|
||||||
.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
|
.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
|
||||||
ifdef INSTALL_UNITS
|
ifdef INSTALL_UNITS
|
||||||
@ -1943,4 +2065,4 @@ ifneq ($(wildcard fpcmake.loc),)
|
|||||||
include fpcmake.loc
|
include fpcmake.loc
|
||||||
endif
|
endif
|
||||||
.PHONY: cleartarget all makefile makefiles
|
.PHONY: cleartarget all makefile makefiles
|
||||||
all: cleartarget gtkglarea$(PPUEXT)
|
all: cleartarget gtkglareacontrol$(PPUEXT)
|
||||||
|
@ -13,7 +13,7 @@ unitdir=. ../../../lcl/units ../../../lcl/units/gtk
|
|||||||
|
|
||||||
[target]
|
[target]
|
||||||
units=gtkglarea
|
units=gtkglarea
|
||||||
implicitunits=gtkglarea_int nvgl gtkglarea
|
implicitunits=gtkglarea_int nvgl gtkglareacontrol
|
||||||
|
|
||||||
[default]
|
[default]
|
||||||
|
|
||||||
@ -31,6 +31,6 @@ zipname=lazarus.gtkglarea.$(ZIPSUFFIX)
|
|||||||
[rules]
|
[rules]
|
||||||
.PHONY: cleartarget all makefile makefiles
|
.PHONY: cleartarget all makefile makefiles
|
||||||
|
|
||||||
all: cleartarget gtkglarea$(PPUEXT)
|
all: cleartarget gtkglareacontrol$(PPUEXT)
|
||||||
|
|
||||||
# end.
|
# end.
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
Author: Mattias Gaertner
|
Author: Mattias Gaertner
|
||||||
|
|
||||||
}
|
}
|
||||||
unit GTKGLArea;
|
unit GTKGLAreaControl;
|
||||||
|
|
||||||
{$MODE objfpc}{$H+}
|
{$MODE objfpc}{$H+}
|
||||||
|
|
@ -18,17 +18,17 @@ Please make sure that you link to the right libgtkgl. If you accidently link to
|
|||||||
<Version Major="1"/>
|
<Version Major="1"/>
|
||||||
<Files Count="5">
|
<Files Count="5">
|
||||||
<Item1>
|
<Item1>
|
||||||
<Filename Value="gtkglarea.pp"/>
|
|
||||||
<HasRegisterProc Value="True"/>
|
|
||||||
<UnitName Value="GTKGLArea"/>
|
|
||||||
</Item1>
|
|
||||||
<Item2>
|
|
||||||
<Filename Value="gtkglarea.lrs"/>
|
<Filename Value="gtkglarea.lrs"/>
|
||||||
<Type Value="LRS"/>
|
<Type Value="LRS"/>
|
||||||
</Item2>
|
</Item1>
|
||||||
<Item3>
|
<Item2>
|
||||||
<Filename Value="gtkglarea_int.pp"/>
|
<Filename Value="gtkglarea_int.pp"/>
|
||||||
<UnitName Value="GTKGLArea_Int"/>
|
<UnitName Value="GTKGLArea_Int"/>
|
||||||
|
</Item2>
|
||||||
|
<Item3>
|
||||||
|
<Filename Value="gtkglareacontrol.pas"/>
|
||||||
|
<HasRegisterProc Value="True"/>
|
||||||
|
<UnitName Value="GTKGLAreaControl"/>
|
||||||
</Item3>
|
</Item3>
|
||||||
<Item4>
|
<Item4>
|
||||||
<Filename Value="nvgl.pp"/>
|
<Filename Value="nvgl.pp"/>
|
||||||
|
@ -8,13 +8,13 @@ unit GTKOpenGL;
|
|||||||
interface
|
interface
|
||||||
|
|
||||||
uses
|
uses
|
||||||
GTKGLArea, GTKGLArea_Int, nvGL, nvGLX, LazarusPackageIntf;
|
GTKGLArea_Int, GTKGLAreaControl, nvGL, nvGLX, LazarusPackageIntf;
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
procedure Register;
|
procedure Register;
|
||||||
begin
|
begin
|
||||||
RegisterUnit('GTKGLArea', @GTKGLArea.Register);
|
RegisterUnit('GTKGLAreaControl', @GTKGLAreaControl.Register);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
initialization
|
initialization
|
||||||
|
@ -254,9 +254,6 @@ const
|
|||||||
{ GLX resources. }
|
{ GLX resources. }
|
||||||
|
|
||||||
type
|
type
|
||||||
|
|
||||||
TXID = cardinal;
|
|
||||||
|
|
||||||
PGLXContextID = ^GLXContextID;
|
PGLXContextID = ^GLXContextID;
|
||||||
GLXContextID = TXID;
|
GLXContextID = TXID;
|
||||||
|
|
||||||
@ -288,8 +285,6 @@ type
|
|||||||
PGLXFBConfigSGIX = ^TGLXFBConfigSGIX;
|
PGLXFBConfigSGIX = ^TGLXFBConfigSGIX;
|
||||||
TGLXFBConfigSGIX = pointer;
|
TGLXFBConfigSGIX = pointer;
|
||||||
|
|
||||||
PCardinal = ^Cardinal;
|
|
||||||
|
|
||||||
{ GLX 1.0 functions. }
|
{ GLX 1.0 functions. }
|
||||||
|
|
||||||
function glXChooseVisual(dpy:PDisplay; screen:longint; attrib_list:Plongint):PXVisualInfo;cdecl;external;
|
function glXChooseVisual(dpy:PDisplay; screen:longint; attrib_list:Plongint):PXVisualInfo;cdecl;external;
|
||||||
|
Loading…
Reference in New Issue
Block a user