Include glfw native routines. Remove redundant libglfw library def

.appveyor.yml

@@ -30,9 +30,7 @@ install:
   - >
     sh -c "
     pacman --needed --noconfirm -S zip unzip base-devel %PACKAGES% &&
-    curl -L http://bodge.borodust.org/files/install.sh | sh &&
-    curl -L http://bodge.borodust.org/files/c2ffi-windows-x86_64.zip -o /tmp/c2ffi.zip &&
-    cd ~/bin/ && unzip /tmp/c2ffi.zip
+    curl -L http://bodge.borodust.org/files/install.sh | sh
     "
 
 build_script:
@@ -52,7 +50,7 @@ build_script:
     export PATH=$HOME/bin/:$PATH
     && rm -rf %APPVEYOR_BUILD_DIR%/spec/*
     && ln -s %APPVEYOR_BUILD_DIR%/ ~/quicklisp/local-projects/
-    && $HOME/bin/lisp %APPVEYOR_BUILD_DIR%/regen-spec.lisp %TARGET_ARCH% '%ASDF_SYSTEM%'
+    && $HOME/bin/lisp %APPVEYOR_BUILD_DIR%/regen-spec.lisp '%ASDF_SYSTEM%' t %TARGET_ARCH%
     && cd ~/quicklisp/local-projects/%ASDF_SYSTEM%/ && zip -r spec.zip spec/
     && mv ~/quicklisp/local-projects/%ASDF_SYSTEM%/spec.zip %APPVEYOR_BUILD_DIR%/
     "

.travis.yml

@@ -50,8 +50,6 @@ before_install:
 install:
   - git submodule update --init --recursive
   - curl -L http://bodge.borodust.org/files/install.sh | sh
-  - curl -L http://bodge.borodust.org/files/c2ffi-$TRAVIS_OS_NAME-$TARGET_ARCH.zip -o /tmp/c2ffi.zip
-  - cd ~/bin/ && unzip /tmp/c2ffi.zip
   - ln -s $TRAVIS_BUILD_DIR/ ~/quicklisp/local-projects/$ASDF_SYSTEM
 
 script:
@@ -68,7 +66,7 @@ script:
         -DGLFW_BUILD_EXAMPLES=OFF . && \
         make
   - rm -rf $TRAVIS_BUILD_DIR/spec/*
-  - lisp "$TRAVIS_BUILD_DIR/regen-spec.lisp" $TARGET_ARCH "$ASDF_SYSTEM"
+  - lisp "$TRAVIS_BUILD_DIR/regen-spec.lisp" "$ASDF_SYSTEM" t $TARGET_ARCH
   - cd $TRAVIS_BUILD_DIR/ && zip -r spec.zip spec/
 
 before_deploy:

bodge-glfw.asd

@@ -7,7 +7,6 @@
   :depends-on (alexandria cffi claw)
   :serial t
   :components ((:file "packages")
-               (:file "libglfw")
                (:static-file "bodge_glfw.h")
                (:file "claw")
                (:file "glfw")

bodge_glfw.h

@@ -3,4 +3,14 @@
 
 #include "GLFW/glfw3.h"
 
+#if defined(_WIN32)
+#  define GLFW_EXPOSE_NATIVE_WIN32 1
+#elif defined(__APPLE__)
+#  define GLFW_EXPOSE_NATIVE_COCOA 1
+#else
+#  define GLFW_EXPOSE_NATIVE_X11 1
+#endif
+
+#include "GLFW/glfw3native.h"
+
 #endif /* _BODGE_GLFW_H_ */

claw.lisp

@@ -1,8 +1,5 @@
 (claw:c-include "bodge_glfw.h" bodge-glfw
-  :in-package :%glfw
   :includes (:glfw-includes)
+  :in-package :%glfw
   :include-definitions ("(glfw|GLFW)\\w*")
-  :exclude-definitions ("^(GL|gl)(?!(FW|fw))\\w*"
-                        "^PFN\\w*"
-                        "glfwGetProcAddress")
   :rename-symbols (claw:by-removing-prefixes "glfw" "GLFW" "GLFW_"))

example.lisp

@@ -10,7 +10,7 @@
   (when (= (%glfw:init) 0)
     (error "Failed to init GLFW"))
   ;; Create a windowed mode window and its OpenGL context
-  (claw:c-with ((window %glfw:window :from (%glfw:create-window 640 480 "Hello World" nil nil)))
+  (let ((window (%glfw:create-window 640 480 "Hello World" nil nil)))
     (when (claw:null-pointer-p window)
       (%glfw:terminate)
       (error "Failed to create GLFW window"))

packages.lisp

@@ -1,7 +1,6 @@
 (cl:defpackage :glfw
   (:use :cl :claw :alexandria)
-  (:export libglfw
-           define-key-callback
+  (:export define-key-callback
            define-window-close-callback
            define-mouse-button-callback
            define-cursor-pos-callback

regen-spec.lisp

@@ -1,9 +1,2 @@
-(bind-arguments *target-arch* *system-name*)
 (script "install-testing-dist")
-
-(ql:register-local-projects)
-(ql:quickload :claw)
-
-(let ((claw::*local-cpu* *target-arch*)
-      (claw::*trace-c2ffi* t))
-  (ql:quickload *system-name*))
+(script "regen-spec")