Browse Source

* gtk1 now depends on opengl in toplevel makefile

git-svn-id: trunk@10099 -
marco 17 years ago
parent
commit
84a51a9c9a
2 changed files with 25 additions and 13 deletions
  1. 12 7
      packages/Makefile
  2. 13 6
      packages/Makefile.fpc

+ 12 - 7
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/27]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/29]
 #
 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-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -7295,16 +7295,21 @@ graph_debug: sdl_debug
 graph_release: sdl_release
 endif
 ifneq ($(findstring $(OS_TARGET),linux darwin freebsd openbsd netbsd solaris),)
-gtk1_all: x11_all
-gtk1_debug: x11_debug
-gtk1_smart: x11_smart
-gtk1_release: x11_release
-gtk1_shared: x11_shared
-gtk2_all: x11_all
+gtk1_all: x11_all opengl_all
+gtk1_debug: x11_debug opengl_debug
+gtk1_smart: x11_smart opengl_smart
+gtk1_release: x11_release opengl_release
+gtk1_shared: x11_shared opengl_shared
+gtk2_all: 
 gtk2_shared: x11_shared
 gtk2_smart: x11_smart
 gtk2_debug: x11_debug
 gtk2_release: x11_release
+gtk1_all:  opengl_all
+gtk1_debug:  opengl_debug
+gtk1_smart:  opengl_smart
+gtk1_release:  opengl_release
+gtk1_shared:  opengl_shared
 endif
 imlib_all: gtk1_all x11_all
 imlib_shared: gtk1_shared x11_shared

+ 13 - 6
packages/Makefile.fpc

@@ -177,17 +177,24 @@ graph_release: sdl_release
 endif
 
 ifneq ($(findstring $(OS_TARGET),linux darwin freebsd openbsd netbsd solaris),)
-gtk1_all: x11_all
-gtk1_debug: x11_debug
-gtk1_smart: x11_smart
-gtk1_release: x11_release
-gtk1_shared: x11_shared
+gtk1_all: x11_all opengl_all
+gtk1_debug: x11_debug opengl_debug
+gtk1_smart: x11_smart opengl_smart
+gtk1_release: x11_release opengl_release
+gtk1_shared: x11_shared opengl_shared
 
-gtk2_all: x11_all
+gtk2_all: 
 gtk2_shared: x11_shared
 gtk2_smart: x11_smart
 gtk2_debug: x11_debug
 gtk2_release: x11_release
+#else
+gtk1_all:  opengl_all
+gtk1_debug:  opengl_debug
+gtk1_smart:  opengl_smart
+gtk1_release:  opengl_release
+gtk1_shared:  opengl_shared
+
 endif
 
 imlib_all: gtk1_all x11_all