paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-02 14:10:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* updated for fpcmake require section

Browse Source
This commit is contained in:
peter 2000-01-24 23:57:56 +00:00
parent 27e457b2cf
commit a681f44129
5 changed files with 76 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/gtk/examples/Makefile
View File

@ -128,7 +128,7 @@ endif
# Default FPCDIR
ifeq ($(FPCDIR),wrong)
override FPCDIR=../..
override FPCDIR=../../..
ifeq ($(wildcard $(FPCDIR)/rtl),)
override FPCDIR=wrong
endif
@ -180,14 +180,13 @@ ZIPTARGET=install
# Directories
override NEEDUNITDIR=..
ifndef TARGETDIR
TARGETDIR=.
endif
# Packages
override PACKAGES+=rtl
override PACKAGES+=rtl gtk
# Libraries
@ -484,6 +483,7 @@ endif
# PACKAGESDIR packages
PACKAGERTL=1
PACKAGEGTK=1
ifdef PACKAGERTL
ifneq ($(wildcard $(FPCDIR)/rtl),)
@ -514,6 +514,35 @@ ifdef UNITDIR_RTL
override NEEDUNITDIR+=$(UNITDIR_RTL)
endif
endif
ifdef PACKAGEGTK
ifneq ($(wildcard $(PACKAGESDIR)/gtk),)
ifneq ($(wildcard $(PACKAGESDIR)/gtk/$(OS_TARGET)),)
PACKAGEDIR_GTK=$(PACKAGESDIR)/gtk/$(OS_TARGET)
else
PACKAGEDIR_GTK=$(PACKAGESDIR)/gtk
endif
ifeq ($(wildcard $(PACKAGEDIR_GTK)/$(FPCMADE)),)
override COMPILEPACKAGES+=package_gtk
package_gtk:
$(MAKE) -C $(PACKAGEDIR_GTK) all
endif
UNITDIR_GTK=$(PACKAGEDIR_GTK)
else
PACKAGEDIR_GTK=
ifneq ($(wildcard $(UNITSDIR)/gtk),)
ifneq ($(wildcard $(UNITSDIR)/gtk/$(OS_TARGET)),)
UNITDIR_GTK=$(UNITSDIR)/gtk/$(OS_TARGET)
else
UNITDIR_GTK=$(UNITSDIR)/gtk
endif
else
UNITDIR_GTK=
endif
endif
ifdef UNITDIR_GTK
override NEEDUNITDIR+=$(UNITDIR_GTK)
endif
endif
#####################################################################

6
packages/gtk/examples/Makefile.fpc
View File

@ -5,12 +5,14 @@
[targets]
programs=entry notebook scribble-simple clist ttt_test pixmap list progressbar
[require]
packages=gtk
[clean]
units=tictactoe
[dirs]
fpcdir=../..
unitdir=..
fpcdir=../../..
targetdir=.
[libs]

9
packages/gtk/examples/list.pp
View File

@ -29,7 +29,6 @@ var
dlist, free_list : pGList;
new_prisoner : pGtkWidget;
list_item : pGtkWidget;
static_dlist : TGList;
begin
{ we only do something if the third (rightmost mouse button
was released }
@ -63,9 +62,6 @@ begin
we need to unselect the item before }
if new_prisoner<>nil then
begin
static_dlist.data := new_prisoner;
static_dlist.next := nil;
static_dlist.prev := nil;
gtk_list_unselect_child(pGTKLIST(gtklist),new_prisoner);
gtk_widget_reparent(new_prisoner, frame);
end;
@ -217,7 +213,10 @@ begin
end.
{
$Log$
Revision 1.1 1999-11-24 23:36:33 peter
Revision 1.2 2000-01-24 23:57:56 peter
* updated for fpcmake require section
Revision 1.1 1999/11/24 23:36:33 peter
* moved to packages dir
Revision 1.8 1999/10/05 09:28:26 peter

35
packages/gtk/tutorial/Makefile
View File

@ -128,7 +128,7 @@ endif
# Default FPCDIR
ifeq ($(FPCDIR),wrong)
override FPCDIR=../..
override FPCDIR=../../..
ifeq ($(wildcard $(FPCDIR)/rtl),)
override FPCDIR=wrong
endif
@ -179,14 +179,13 @@ ZIPTARGET=install
# Directories
override NEEDUNITDIR=..
ifndef TARGETDIR
TARGETDIR=.
endif
# Packages
override PACKAGES+=rtl
override PACKAGES+=rtl gtk
# Libraries
@ -483,6 +482,7 @@ endif
# PACKAGESDIR packages
PACKAGERTL=1
PACKAGEGTK=1
ifdef PACKAGERTL
ifneq ($(wildcard $(FPCDIR)/rtl),)
@ -513,6 +513,35 @@ ifdef UNITDIR_RTL
override NEEDUNITDIR+=$(UNITDIR_RTL)
endif
endif
ifdef PACKAGEGTK
ifneq ($(wildcard $(PACKAGESDIR)/gtk),)
ifneq ($(wildcard $(PACKAGESDIR)/gtk/$(OS_TARGET)),)
PACKAGEDIR_GTK=$(PACKAGESDIR)/gtk/$(OS_TARGET)
else
PACKAGEDIR_GTK=$(PACKAGESDIR)/gtk
endif
ifeq ($(wildcard $(PACKAGEDIR_GTK)/$(FPCMADE)),)
override COMPILEPACKAGES+=package_gtk
package_gtk:
$(MAKE) -C $(PACKAGEDIR_GTK) all
endif
UNITDIR_GTK=$(PACKAGEDIR_GTK)
else
PACKAGEDIR_GTK=
ifneq ($(wildcard $(UNITSDIR)/gtk),)
ifneq ($(wildcard $(UNITSDIR)/gtk/$(OS_TARGET)),)
UNITDIR_GTK=$(UNITSDIR)/gtk/$(OS_TARGET)
else
UNITDIR_GTK=$(UNITSDIR)/gtk
endif
else
UNITDIR_GTK=
endif
endif
ifdef UNITDIR_GTK
override NEEDUNITDIR+=$(UNITDIR_GTK)
endif
endif
#####################################################################

6
packages/gtk/tutorial/Makefile.fpc
View File

@ -5,9 +5,11 @@
[targets]
programs=$(subst $(PASEXT),,$(wildcard tut*$(PASEXT)))
[require]
packages=gtk
[dirs]
fpcdir=../..
unitdir=..
fpcdir=../../..
targetdir=.
[libs]