more testing

diku-dk · Jan 10, 2024 · e958fd3 · e958fd3
1 parent ac476ca
commit e958fd3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [macos-12, ubuntu-latest]
+        os: [macos-11, ubuntu-latest]
     steps:
     - name: Check out code
       uses: actions/checkout@v1

diff --git a/ci/ci.c b/ci/ci.c
@@ -298,7 +298,7 @@ void customShader() {
         "   color = c;"
         "}\n";
 
-    //tigrSetPostShader(win, shader, sizeof(shader) - 1);
+    tigrSetPostShader(win, shader, sizeof(shader) - 1);
     tigrSetPostFX(win, 3.14 / 2, 0, 0, 0);
     tigrUpdate(win);
     tigrFree(win);
@@ -374,7 +374,7 @@ int main(int argc, char* argv[]) {
                      { "Window basics", windowBasics, 1 },
                      { "Unicode", unicode, 0 },
                      { "Timing", timing, 1 },
-                     // { "Custom fx shader", customShader, 2 },
+                     { "Custom fx shader", customShader, 2 },
                      { "Direct OpenGL calls", directOpenGL, 2 },
                      { "Input processing", input, 1 },
                      { 0 } };

diff --git a/sml-examples/hello/Makefile b/sml-examples/hello/Makefile
@@ -1,22 +1,23 @@
 PROGNAME=hello
 MLKIT=mlkit
-
+LIBS=
 ifeq ($(OS),Windows_NT)
 	LDFLAGS += -s -lopengl32 -lgdi32
 else
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Darwin)
 		LDFLAGS += -arch x86_64 -framework OpenGL -framework Cocoa -L. -ltigr
 	else ifeq ($(UNAME_S),Linux)
-		LDFLAGS += -L. -lGLU -lGL -lX11 -ltigr
+		LDFLAGS += -L.
+		LIBS += -libs 'm,c,dl,GLU,GL,X11,tigr'
 	endif
 endif
 
 .PHONY: all
 all: $(PROGNAME).exe
 
 $(PROGNAME).exe: $(PROGNAME).mlb $(PROGNAME).sml libtigr.so
-	MLCOMP=mlkit $(MLKIT) -ldexe '$(CC) $(LDFLAGS)' -o $@ $<
+	MLCOMP=mlkit $(MLKIT) -ldexe '$(CC) $(LDFLAGS)' $(LIBS) -o $@ $<
 
 libtigr.so: ../../lib/github.com/diku-dk/sml-tigr/clib/libtigr.so
 	cp $< $@