smoothing out build issues, especially on macosx

Author: jtsiomb

.github/workflows/build_gnulinux.yml

@@ -55,7 +55,9 @@ jobs:
       run: make
 
     - name: build examples
-      run: make examples
+      run: |
+        make -C examples/simple simple_af_unix
+        make -C examples/fly
 
     - name: stage install
       run: |

.github/workflows/build_macosx.yml

@@ -54,7 +54,9 @@ jobs:
       run: make
 
     - name: build examples
-      run: make examples
+      run: |
+        make -C examples/simple simple_af_unix
+        make -C examples/fly
 
     - name: stage install
       run: |

Makefile.in

@@ -5,8 +5,8 @@ hdr = src/spnav.h src/spnav_magellan.h src/spnav_config.h
 name = spnav
 lib_a = lib$(name).a
 
-incpaths = -I. -I/usr/local/include -I/usr/X11R6/include
-libpaths = -L/usr/local/lib -L/usr/X11R6/lib
+incpaths = -I. -I/usr/local/include -I/usr/X11R6/include -I/opt/homebrew/include
+libpaths = -L/usr/local/lib -L/usr/X11R6/lib -L/opt/homebrew/lib
 
 CC ?= gcc
 AR ?= ar

examples/cube/Makefile

@@ -1,9 +1,12 @@
 obj = cube.o
 bin = cube
 
-CC = gcc
-CFLAGS = -pedantic -Wall -g -I../.. -I../../src -I/usr/local/include
-LDFLAGS = -L../.. -L/usr/local/lib -lGL -lGLU -lspnav -lX11 -lm
+incdir =  -I../.. -I../../src -I/usr/local/include -I/usr/X11R6/include \
+		  -I/opt/homebrew/include
+libdir = -L../.. -L/usr/local/lib -L/usr/X11R6/lib -L/opt/homebrew/lib
+
+CFLAGS = -pedantic -Wall -g $(incdir)
+LDFLAGS = $(libdir) -lGL -lGLU -lspnav -lX11 -lm
 
 $(bin): $(obj)
 	$(CC) -o $@ $(obj) $(LDFLAGS)

examples/fly/Makefile

@@ -1,9 +1,12 @@
 obj = fly.o xwin.o
 bin = fly
 
-CC = gcc
-CFLAGS = -pedantic -Wall -O3 -I../.. -I../../src -I/usr/local/include
-LDFLAGS = -L../.. -L/usr/local/lib -lGL -lGLU -lspnav -lX11 -lm
+incdir =  -I../.. -I../../src -I/usr/local/include -I/usr/X11R6/include \
+		  -I/opt/homebrew/include
+libdir = -L../.. -L/usr/local/lib -L/usr/X11R6/lib -L/opt/homebrew/lib
+
+CFLAGS = -pedantic -Wall -O3 $(incdir)
+LDFLAGS = $(libdir) -lGL -lGLU -lspnav -lX11 -lm
 
 $(bin): $(obj)
 	$(CC) -o $@ $(obj) $(LDFLAGS)

examples/simple/Makefile

@@ -1,6 +1,9 @@
-CC = gcc
-CFLAGS = -pedantic -Wall -g -I../.. -I../../src -I/usr/local/include
-LDFLAGS = -L../.. -L/usr/local/lib -lspnav -lX11 -lm
+incdir =  -I../.. -I../../src -I/usr/local/include -I/usr/X11R6/include \
+		  -I/opt/homebrew/include
+libdir = -L../.. -L/usr/local/lib -L/usr/X11R6/lib -L/opt/homebrew/lib
+
+CFLAGS = -pedantic -Wall -g $(incdir)
+LDFLAGS = $(libdir) -lspnav -lX11 -lm
 
 .PHONY: all
 all: simple_x11 simple_af_unix