From 6c7d64620ce86ad5c4f4e0259648afac825c1567 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Mon, 5 Jan 2009 20:58:46 +0000 Subject: [PATCH] * enabled opengles package for darwin/i386, it works fine under the iPhone simulator git-svn-id: trunk@12516 - --- packages/Makefile | 93 +++++++++++++++++----------------- packages/Makefile.fpc | 2 +- packages/opengles/Makefile | 3 ++ packages/opengles/Makefile.fpc | 1 + 4 files changed, 52 insertions(+), 47 deletions(-) diff --git a/packages/Makefile b/packages/Makefile index f7f4b270a4..b06d8c1ccc 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -302,7 +302,7 @@ ifeq ($(FULL_TARGET),i386-wdosx) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-process unzip regexpr chm fcl-res libgd symbolic endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-process unzip regexpr chm fcl-res libgd symbolic fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc graph univint sdl opengl x11 cairo gtk1 gtk2 fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib +override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-process unzip regexpr chm fcl-res libgd symbolic fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc graph univint sdl opengl x11 cairo gtk1 gtk2 fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib opengles endif ifeq ($(FULL_TARGET),i386-emx) override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json fcl-process unzip regexpr chm fcl-res libgd symbolic fv zlib libpng x11 tcl fpgtk rexx os2units gtk1 imlib @@ -2236,6 +2236,7 @@ TARGET_DIRS_HTTPD13=1 TARGET_DIRS_HTTPD20=1 TARGET_DIRS_HTTPD22=1 TARGET_DIRS_IMLIB=1 +TARGET_DIRS_OPENGLES=1 endif ifeq ($(FULL_TARGET),i386-emx) TARGET_DIRS_HASH=1 @@ -8005,6 +8006,51 @@ univint: $(MAKE) -C univint all .PHONY: univint_all univint_debug univint_smart univint_release univint_units univint_examples univint_shared univint_install univint_sourceinstall univint_exampleinstall univint_distinstall univint_zipinstall univint_zipsourceinstall univint_zipexampleinstall univint_zipdistinstall univint_clean univint_distclean univint_cleanall univint_info univint_makefiles univint endif +ifdef TARGET_DIRS_OPENGLES +opengles_all: + $(MAKE) -C opengles all +opengles_debug: + $(MAKE) -C opengles debug +opengles_smart: + $(MAKE) -C opengles smart +opengles_release: + $(MAKE) -C opengles release +opengles_units: + $(MAKE) -C opengles units +opengles_examples: + $(MAKE) -C opengles examples +opengles_shared: + $(MAKE) -C opengles shared +opengles_install: + $(MAKE) -C opengles install +opengles_sourceinstall: + $(MAKE) -C opengles sourceinstall +opengles_exampleinstall: + $(MAKE) -C opengles exampleinstall +opengles_distinstall: + $(MAKE) -C opengles distinstall +opengles_zipinstall: + $(MAKE) -C opengles zipinstall +opengles_zipsourceinstall: + $(MAKE) -C opengles zipsourceinstall +opengles_zipexampleinstall: + $(MAKE) -C opengles zipexampleinstall +opengles_zipdistinstall: + $(MAKE) -C opengles zipdistinstall +opengles_clean: + $(MAKE) -C opengles clean +opengles_distclean: + $(MAKE) -C opengles distclean +opengles_cleanall: + $(MAKE) -C opengles cleanall +opengles_info: + $(MAKE) -C opengles info +opengles_makefiles: + $(MAKE) -C opengles makefiles +opengles: + $(MAKE) -C opengles all +.PHONY: opengles_all opengles_debug opengles_smart opengles_release opengles_units opengles_examples opengles_shared opengles_install opengles_sourceinstall opengles_exampleinstall opengles_distinstall opengles_zipinstall opengles_zipsourceinstall opengles_zipexampleinstall opengles_zipdistinstall opengles_clean opengles_distclean opengles_cleanall opengles_info opengles_makefiles opengles +endif ifdef TARGET_DIRS_AMUNITS amunits_all: $(MAKE) -C amunits all @@ -8095,51 +8141,6 @@ palmunits: $(MAKE) -C palmunits all .PHONY: palmunits_all palmunits_debug palmunits_smart palmunits_release palmunits_units palmunits_examples palmunits_shared palmunits_install palmunits_sourceinstall palmunits_exampleinstall palmunits_distinstall palmunits_zipinstall palmunits_zipsourceinstall palmunits_zipexampleinstall palmunits_zipdistinstall palmunits_clean palmunits_distclean palmunits_cleanall palmunits_info palmunits_makefiles palmunits endif -ifdef TARGET_DIRS_OPENGLES -opengles_all: - $(MAKE) -C opengles all -opengles_debug: - $(MAKE) -C opengles debug -opengles_smart: - $(MAKE) -C opengles smart -opengles_release: - $(MAKE) -C opengles release -opengles_units: - $(MAKE) -C opengles units -opengles_examples: - $(MAKE) -C opengles examples -opengles_shared: - $(MAKE) -C opengles shared -opengles_install: - $(MAKE) -C opengles install -opengles_sourceinstall: - $(MAKE) -C opengles sourceinstall -opengles_exampleinstall: - $(MAKE) -C opengles exampleinstall -opengles_distinstall: - $(MAKE) -C opengles distinstall -opengles_zipinstall: - $(MAKE) -C opengles zipinstall -opengles_zipsourceinstall: - $(MAKE) -C opengles zipsourceinstall -opengles_zipexampleinstall: - $(MAKE) -C opengles zipexampleinstall -opengles_zipdistinstall: - $(MAKE) -C opengles zipdistinstall -opengles_clean: - $(MAKE) -C opengles clean -opengles_distclean: - $(MAKE) -C opengles distclean -opengles_cleanall: - $(MAKE) -C opengles cleanall -opengles_info: - $(MAKE) -C opengles info -opengles_makefiles: - $(MAKE) -C opengles makefiles -opengles: - $(MAKE) -C opengles all -.PHONY: opengles_all opengles_debug opengles_smart opengles_release opengles_units opengles_examples opengles_shared opengles_install opengles_sourceinstall opengles_exampleinstall opengles_distinstall opengles_zipinstall opengles_zipsourceinstall opengles_zipexampleinstall opengles_zipdistinstall opengles_clean opengles_distclean opengles_cleanall opengles_info opengles_makefiles opengles -endif all: $(addsuffix _all,$(TARGET_DIRS)) debug: $(addsuffix _debug,$(TARGET_DIRS)) smart: $(addsuffix _smart,$(TARGET_DIRS)) diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index c084eb41cb..3ac1cc779d 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -25,7 +25,7 @@ dirs_freebsd=fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres users iconvenc dirs_darwin=fv fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \ libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc -dirs_i386_darwin=graph univint sdl opengl x11 cairo gtk1 gtk2 fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib +dirs_i386_darwin=graph univint sdl opengl x11 cairo gtk1 gtk2 fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib opengles dirs_powerpc_darwin=graph univint sdl opengl x11 cairo gtk1 gtk2 fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib dirs_x86_64_darwin=opengl x11 cairo gtk1 gtk2 fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib dirs_powerpc64_darwin=opengl x11 cairo gtk1 gtk2 fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib diff --git a/packages/opengles/Makefile b/packages/opengles/Makefile index ceb2be2717..a5af46c270 100644 --- a/packages/opengles/Makefile +++ b/packages/opengles/Makefile @@ -264,6 +264,9 @@ endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) override PACKAGE_NAME=opengles override PACKAGE_VERSION=2.2.2 +ifeq ($(FULL_TARGET),i386-darwin) +override TARGET_UNITS+=gles11 +endif ifeq ($(FULL_TARGET),arm-darwin) override TARGET_UNITS+=gles11 endif diff --git a/packages/opengles/Makefile.fpc b/packages/opengles/Makefile.fpc index 0f105c62aa..21a72a5573 100644 --- a/packages/opengles/Makefile.fpc +++ b/packages/opengles/Makefile.fpc @@ -12,6 +12,7 @@ version=2.2.2 [target] units_arm_darwin=gles11 +units_i386_darwin=gles11 exampledirs=examples [install]