GLURaw 1.1.0.1 → 1.2.0.0

raw patch · 4 files changed

+18/−2 lines, 4 filesdep ~OpenGLRawdep ~basePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: OpenGLRaw, base

API changes (from Hackage documentation)

Files

• GLURaw.cabal +2/−2
• cbits/HsGLURaw.c +12/−0
• src/Graphics/Rendering/GLU/Raw/Callbacks.hs +2/−0
• src/Graphics/Rendering/GLU/Raw/Functions.hs +2/−0

@@ -1,5 +1,5 @@ name: GLURaw-version: 1.1.0.1+version: 1.2.0.0 license: BSD3 license-file: LICENSE maintainer: Jason Dagit <dagitj@gmail.com>, Sven Panne <sven.panne@aedion.de>@@ -42,7 +42,7 @@       cbits/HsGLURaw.c    hs-Source-Dirs: src    include-dirs: include-   build-depends: base >= 3 && < 5, OpenGLRaw+   build-depends: base >= 3 && < 5, OpenGLRaw == 1.2.*    ghc-options: -Wall    if os(windows) && flag(UseNativeWindowsLibraries)       cpp-options: "-DCALLCONV=stdcall"

@@ -69,6 +69,11 @@ #include <stdlib.h> #include <dlfcn.h> +#ifndef __APPLE__+#include <stdio.h>+#include <GL/glu.h>+#endif+ void* hs_GLU_getProcAddress(const char *name) {@@ -80,6 +85,13 @@     /* Get a handle for our executable. */     handle = dlopen(NULL, RTLD_LAZY);   }++#ifndef __APPLE__+  /* Hack to force linking of GLU on Linux */+  FILE *bitbucket = fopen("/dev/null", "w");+  fprintf(bitbucket, "%p\n", gluBeginCurve);+  fclose(bitbucket); +#endif    return handle ? dlsym(handle, name) : NULL; }

@@ -50,7 +50,9 @@ ) where  import Foreign.Ptr+import Foreign.C.Types import Graphics.Rendering.OpenGL.Raw+import Graphics.Rendering.OpenGL.Raw.Core31.TypesInternal  -------------------------------------------------------------------------------- 

@@ -76,9 +76,11 @@ ) where  import Foreign.Ptr+import Foreign.C.Types import Graphics.Rendering.GLU.Raw.APIEntry import Graphics.Rendering.GLU.Raw.Types import Graphics.Rendering.OpenGL.Raw.Core31+import Graphics.Rendering.OpenGL.Raw.Core31.TypesInternal  #include "HsGLURaw.h"