fix

diff --git a/.gitignore b/.gitignore
index 379dcb07d5b28793ecca1abcf2bd7e25c0aa79f1..4f96ea520e4604137685e5a47e89716c970afc3d 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 !*/
 
 build.linux/
-cglm/
+build.win32/
 
 # ALLOW ============================
 !.gitattributes

diff --git a/build.sh b/build.sh
index 2ce525a1cac803535b4d038cb65e2df3d356047c..598e7fe57473fad96f2c69f7d71b5c0431735c27 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -6,6 +6,13 @@ lib="-I. -L./lib -L./"
 libs="-lGL -lglfw -lX11 -lXxf86vm -lXrandr -lm -lpthread -lXi -ldl" # -l:steam/libsteam_api.so"
 flags="-fsanitize=address -ggdb3 -Wno-unused-function -DNO_STEAM"
 
+if [[ "$OSTYPE" != "linux-gnu"* ]]; then
+       echo "Operating system is not GNU/Linux, windows will be assumed."
+       target="fishladder.exe"
+       libs="-lglfw3 -lopengl32 -lm -mwindows"
+       flags="-ggdb3 -Wno-unused-function -DNO_STEAM"
+fi
+
 run_after=false
 do_build=true
 
@@ -43,18 +50,35 @@ if [ "$do_build" = true ]; then
        echo "Build succeeded"
 fi
 
-# Directories to initialize
-mkdir build.linux/cfg -p
-mkdir build.linux/textures -p
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+       # Directories to initialize
+       mkdir build.linux/cfg -p
+       mkdir build.linux/textures -p
 
-cp $target ./build.linux/$target
-cp ./steam/libsteam_api.so ./build.linux/libsteam_api.so
-cp -r ./textures/ ./build.linux/
+       cp $target ./build.linux/$target
+       cp ./steam/libsteam_api.so ./build.linux/libsteam_api.so
+       cp -r ./textures/ ./build.linux/
 
-if [ "$run_after" = true ]; then
-       echo "Playing"
+       if [ "$run_after" = true ]; then
+               echo "Playing"
 
-       cd ./build.linux/
-       ./$target
-       cd ./../
-fi
+               cd ./build.linux/
+               ./$target
+               cd ./../
+       fi
+else
+       mkdir build.win32/cfg -p
+       mkdir build.win32/textures -p
+       
+       cp $target ./build.win32/$target
+       cp -r ./textures/ ./build.win32/
+       cp ./lib/glfw3.dll ./build.win32/glfw3.dll
+       
+       if [ "$run_after" = true ]; then
+               echo "Playing"
+               
+               cd ./build.win32/
+               ./$target
+               cd ./../
+       fi
+fi
\ No newline at end of file

diff --git a/fishladder.c b/fishladder.c
deleted file mode 100644 (file)
index 62ed2a1..0000000
--- a/fishladder.c
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved
-
-//#define VG_STEAM
-#include "vg/vg.h"
-
-m3x3f m_projection;
-m3x3f m_view;
-m3x3f m_mdl;
-
-int main( int argc, char *argv[] ) { vg_init( argc, argv, "FishLadder" ); }
-
-void vg_register(void){}
-void vg_start(void){}
-void vg_update(void){}
-
-void vg_render(void) 
-{
-       glViewport( 0,0, vg_window_x, vg_window_y );
-
-       glDisable( GL_DEPTH_TEST );
-       glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
-       glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-       
-       // Rest of drawing code...
-}
-
-void vg_ui(void){}
-void vg_free(void){}

diff --git a/gl/glad/glad.h b/gl/glad/glad.h
index 07181990d9bb5d1c5cd72e3ee73cce178e36a7ee..62b7e70470592924a807ccd61b6dea6d1c23bb19 100644 (file)
--- a/gl/glad/glad.h
+++ b/gl/glad/glad.h
@@ -92,7 +92,7 @@ typedef void (* GLADcallback)(const char *name, void *funcptr, int len_args, ...
 
 GLAPI void glad_set_pre_callback(GLADcallback cb);
 GLAPI void glad_set_post_callback(GLADcallback cb);
-#include <KHR/khrplatform.h>
+#include "gl/KHR/khrplatform.h"
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;

diff --git a/vg/vg.h b/vg/vg.h
index b35091b5aa5e2779e39c64ccf76bdad1dee225ee..f3ff15997c11072060a201dfc2c827088135f3e3 100644 (file)
--- a/vg/vg.h
+++ b/vg/vg.h
@@ -132,7 +132,7 @@ static inline int vg_get_button_up( const char *button )
 
 static inline int key_is_keyboard( int const id )
 {
-       static_assert( GLFW_MOUSE_BUTTON_LAST < GLFW_KEY_SPACE, "GLFW: Mouse has too many buttons" );
+       vg_static_assert( GLFW_MOUSE_BUTTON_LAST < GLFW_KEY_SPACE, "GLFW: Mouse has too many buttons" );
        return id > GLFW_MOUSE_BUTTON_LAST;
 }
 

diff --git a/vg/vg_platform.h b/vg/vg_platform.h
index 280051942ee6cadf1f27e5b89fb83116f5c9b864..a5b36033e0edd9ccfb04df9591b974086df39926 100644 (file)
--- a/vg/vg_platform.h
+++ b/vg/vg_platform.h
@@ -21,6 +21,8 @@ typedef v3f                   m3x3f[3];
 typedef v3f                    m4x3f[4];
 typedef v3f                    boxf[2];
 
+#define vg_static_assert _Static_assert
+
 #define vg_list_size( A ) (sizeof(A)/sizeof(A[0]))
 
 // THREADING