diff --git a/lcl/Makefile b/lcl/Makefile index 48fc5be6ac..0b369774b2 100644 --- a/lcl/Makefile +++ b/lcl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/12/21] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/24] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -183,11 +183,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -254,7 +257,7 @@ endif endif override TARGET_DIRS+=interfaces override TARGET_UNITS+=alllclunits -override TARGET_IMPLICITUNITS+=actnlist arrow avglcltree buttons calendar checklst clipbrd clistbox comctrls commctrl controls dbctrls dbgrids dialogs dirsel dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings filectrl fpcadds forms graphics graphmath graphtype grids imglist interfacebase lazlinkedlist lclintf lclproc lclmemmanager lclstrconsts lcltype lmessages lresources maskedit menus pairsplitter postscriptprinter printers spin stdctrls stringhashlist textstrings toolwin utrace vclglobals +override TARGET_IMPLICITUNITS+=actnlist arrow avglcltree buttons calendar checklst clipbrd clistbox comctrls commctrl controls dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings filectrl fpcadds forms graphics graphmath graphtype grids imglist interfacebase lazlinkedlist lclintf lclproc lclmemmanager lclstrconsts lcltype lmessages lresources maskedit menus pairsplitter postscriptprinter printers spin stdctrls stringhashlist textstrings toolwin utrace vclglobals override TARGET_RSTS+=lclstrconsts override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) override INSTALL_BUILDUNIT=alllclunits @@ -1150,6 +1153,36 @@ REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK=1 endif endif +ifeq ($(OS_TARGET),netbsd) +ifeq ($(CPU_TARGET),powerpc) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_NETDB=1 +REQUIRE_PACKAGES_LIBASYNC=1 +REQUIRE_PACKAGES_FCL=1 +REQUIRE_PACKAGES_MYSQL=1 +REQUIRE_PACKAGES_IBASE=1 +REQUIRE_PACKAGES_SQLITE=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK=1 +endif +endif +ifeq ($(OS_TARGET),netbsd) +ifeq ($(CPU_TARGET),sparc) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_NETDB=1 +REQUIRE_PACKAGES_LIBASYNC=1 +REQUIRE_PACKAGES_FCL=1 +REQUIRE_PACKAGES_MYSQL=1 +REQUIRE_PACKAGES_IBASE=1 +REQUIRE_PACKAGES_SQLITE=1 +REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_OPENGL=1 +REQUIRE_PACKAGES_GTK=1 +endif +endif ifeq ($(OS_TARGET),amiga) ifeq ($(CPU_TARGET),m68k) REQUIRE_PACKAGES_RTL=1 @@ -1283,9 +1316,13 @@ ifeq ($(OS_TARGET),darwin) ifeq ($(CPU_TARGET),powerpc) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_FCL=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 +REQUIRE_PACKAGES_PTHREADS=1 +REQUIRE_PACKAGES_FCL=1 +REQUIRE_PACKAGES_MYSQL=1 +REQUIRE_PACKAGES_IBASE=1 +REQUIRE_PACKAGES_SQLITE=1 REQUIRE_PACKAGES_OPENGL=1 REQUIRE_PACKAGES_GTK=1 endif diff --git a/lcl/Makefile.fpc b/lcl/Makefile.fpc index 7e539c5d8d..894f0b0687 100644 --- a/lcl/Makefile.fpc +++ b/lcl/Makefile.fpc @@ -25,7 +25,6 @@ implicitunits= \ dbctrls \ dbgrids \ dialogs \ - dirsel \ dynamicarray \ dynhasharray \ editbtn \ diff --git a/lcl/alllclunits.pp b/lcl/alllclunits.pp index d1e74817cb..e24af8af2a 100644 --- a/lcl/alllclunits.pp +++ b/lcl/alllclunits.pp @@ -38,7 +38,7 @@ uses Buttons, Extctrls, Calendar, Clipbrd, Forms, LCLIntf, Spin, Comctrls, Graphics, StdCtrls, Arrow, Controls, ImgList, Menus, Toolwin, Dialogs, Messages, Clistbox, ActnList, Grids, MaskEdit, - Printers, PostScriptPrinter, CheckLst, PairSplitter, DirSel, ExtDlgs, + Printers, PostScriptPrinter, CheckLst, PairSplitter, ExtDlgs, DBCtrls, DBGrids, EditBtn; implementation @@ -48,6 +48,9 @@ end. { ============================================================================= $Log$ + Revision 1.7 2004/01/26 11:58:37 mattias + excluded dirsel.pp from makefile + Revision 1.6 2003/12/25 14:17:07 mattias fixed many range check warnings