--- Merging r19961 into '.':

U    packages/opengl/Makefile.fpc
C    packages/opengl/Makefile
Summary of conflicts:
  Text conflicts: 1

# revisions: 19961
------------------------------------------------------------------------
r19961 | florian | 2012-01-04 14:30:17 +0100 (Wed, 04 Jan 2012) | 1 line
Changed paths:
   M /trunk/packages/opengl/Makefile
   M /trunk/packages/opengl/Makefile.fpc

* build glext on win64, resolves #21013
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@20023 -

packages/opengl/Makefile

@@ -427,7 +427,7 @@ ifeq ($(FULL_TARGET),x86_64-darwin)
 override TARGET_UNITS+=gl glu glut  glx glext
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=gl glu glut
+override TARGET_UNITS+=gl glu glut  glext
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override TARGET_UNITS+=gl glu glut

packages/opengl/Makefile.fpc

@@ -17,6 +17,7 @@ packages_i386_iphonesim=x11
 [target]
 units=gl glu glut
 units_win32=glext
+units_win64=glext
 units_haiku=glext
 units_linux=glx glext
 units_freebsd=glx glext