From e34bc1f2b0312a87cd9f0952d029077f5f09c558 Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 30 Sep 2005 23:27:37 +0000 Subject: [PATCH] added -WG switch for target win32 git-svn-id: trunk@7867 - --- examples/Makefile | 72 +++++++++++++++++++++++++++++++++++++++++-- examples/Makefile.fpc | 6 ++++ examples/bitbutton.pp | 4 --- 3 files changed, 75 insertions(+), 7 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 40eb4095f5..ed31f0bffe 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/09] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/09/23] # 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 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 arm-linux +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 BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx LIMIT83fs = go32v2 os2 emx watcom @@ -239,6 +239,9 @@ LCL_PLATFORM=gtk endif export LCL_PLATFORM endif +ifeq ($(OS_TARGET),win32) +LAZARUS_OPT+= -WG +endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar endif @@ -284,6 +287,9 @@ endif ifeq ($(FULL_TARGET),i386-netwlibc) override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar endif +ifeq ($(FULL_TARGET),i386-wince) +override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar endif @@ -335,9 +341,15 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar endif +ifeq ($(FULL_TARGET),x86_64-win64) +override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar endif +ifeq ($(FULL_TARGET),arm-wince) +override TARGET_UNITS+=hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 taborder testall toolbar trackbar +endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar endif @@ -383,6 +395,9 @@ endif ifeq ($(FULL_TARGET),i386-netwlibc) override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar endif +ifeq ($(FULL_TARGET),i386-wince) +override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar +endif ifeq ($(FULL_TARGET),m68k-linux) override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar endif @@ -434,9 +449,15 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar endif +ifeq ($(FULL_TARGET),x86_64-win64) +override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar +endif ifeq ($(FULL_TARGET),arm-linux) override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar endif +ifeq ($(FULL_TARGET),arm-wince) +override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) hello bitbutton checkbox combobox comdialogs edittest groupbox groupboxnested listboxtest listviewtest loadpicture memotest messagedialogs notebk notebooktest progressbar scrollbar speedtest synedit1 testall toolbar trackbar +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-gl endif @@ -482,6 +503,9 @@ endif ifeq ($(FULL_TARGET),i386-netwlibc) override COMPILER_OPTIONS+=-gl endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_OPTIONS+=-gl +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_OPTIONS+=-gl endif @@ -533,9 +557,15 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_OPTIONS+=-gl endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_OPTIONS+=-gl +endif ifeq ($(FULL_TARGET),arm-linux) override COMPILER_OPTIONS+=-gl endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_OPTIONS+=-gl +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) . endif @@ -581,6 +611,9 @@ endif ifeq ($(FULL_TARGET),i386-netwlibc) override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) . endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) . +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) . endif @@ -632,9 +665,15 @@ endif ifeq ($(FULL_TARGET),x86_64-freebsd) override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) . endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) . +endif ifeq ($(FULL_TARGET),arm-linux) override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) . endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) . +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1547,6 +1586,15 @@ REQUIRE_PACKAGES_PASJPEG=1 REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_LIBASYNC=1 endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL=1 +REQUIRE_PACKAGES_REGEXPR=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 +REQUIRE_PACKAGES_LIBASYNC=1 +endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1751,6 +1799,15 @@ REQUIRE_PACKAGES_POSTGRES=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_SQLITE=1 endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL=1 +REQUIRE_PACKAGES_REGEXPR=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 +REQUIRE_PACKAGES_LIBASYNC=1 +endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 @@ -1765,6 +1822,15 @@ REQUIRE_PACKAGES_POSTGRES=1 REQUIRE_PACKAGES_MYSQL=1 REQUIRE_PACKAGES_SQLITE=1 endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL=1 +REQUIRE_PACKAGES_REGEXPR=1 +REQUIRE_PACKAGES_PASJPEG=1 +REQUIRE_PACKAGES_NETDB=1 +REQUIRE_PACKAGES_LIBASYNC=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2126,7 +2192,7 @@ else FPCCPUOPT:= endif endif -override FPCOPT+=-Xs $(FPCCPUOPT) -n +override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE endif ifdef STRIP diff --git a/examples/Makefile.fpc b/examples/Makefile.fpc index fdef18cfb2..36b18f6afa 100644 --- a/examples/Makefile.fpc +++ b/examples/Makefile.fpc @@ -81,3 +81,9 @@ endif export LCL_PLATFORM endif +# +# apptype gui +ifeq ($(OS_TARGET),win32) +LAZARUS_OPT+= -WG +endif + diff --git a/examples/bitbutton.pp b/examples/bitbutton.pp index 03ca3c92a0..b3cb0ce941 100644 --- a/examples/bitbutton.pp +++ b/examples/bitbutton.pp @@ -22,10 +22,6 @@ program bitbutton; {$mode objfpc}{$H+} -{$IFDEF Win32} -{$APPTYPE GUI} -{$ENDIF} - uses interfaces, forms, bitbtnform;