fixes

diku-dk · Jan 10, 2024 · 53fd05a · 53fd05a
1 parent bf613b1
commit 53fd05a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/ci/Makefile b/ci/Makefile
@@ -1,11 +1,12 @@
-CFLAGS += -I.. -arch x86_64
+CFLAGS += -I..
 ifeq ($(OS),Windows_NT)
 	LDFLAGS += -s -lopengl32 -lgdi32
 	EXT = .exe
 else
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Darwin)
 		LDFLAGS += -framework OpenGL -framework Cocoa -L. -ltigr
+		CFLAGS += -arch x86_64
 	else ifeq ($(UNAME_S),Linux)
 		LDFLAGS += -s -lGLU -lGL -lX11 -L. -ltigr
 	endif

diff --git a/lib/github.com/diku-dk/sml-tigr/clib/Makefile b/lib/github.com/diku-dk/sml-tigr/clib/Makefile
@@ -1,15 +1,25 @@
-
-LD=cc -arch x86_64
-LDFLAGS=-framework OpenGL -framework Cocoa
+CFLAGS += -I.
+ifeq ($(OS),Windows_NT)
+	LDFLAGS += -s -lopengl32 -lgdi32
+	EXT = .exe
+else
+	UNAME_S := $(shell uname -s)
+	ifeq ($(UNAME_S),Darwin)
+		LDFLAGS += -arch x86_64 -framework OpenGL -framework Cocoa
+		CFLAGS += -arch x86_64
+	else ifeq ($(UNAME_S),Linux)
+		LDFLAGS += -s -lGLU -lGL -lX11 -L. -ltigr
+	endif
+endif
 
 .PHONY: lib
 lib: libtigr.so
 
 %.o: %.c
-	$(CC) -arch x86_64 -c -o $@ -I. $<
+	$(CC) -c -o $@ $(CFLAGS) $<
 
 libtigr.so: tigr.o tigr2.o
-	$(LD) -shared -o $@ $^ $(LDFLAGS)
+	$(CC) -shared -o $@ $^ $(LDFLAGS)
 
 .PHONY: clean
 clean:

diff --git a/sml-examples/flags/Makefile b/sml-examples/flags/Makefile
@@ -1,14 +1,12 @@
 PROGNAME=flags
-
 MLKIT=mlkit
-LD=cc -arch x86_64
 
 ifeq ($(OS),Windows_NT)
 	LDFLAGS += -s -lopengl32 -lgdi32
 else
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Darwin)
-		LDFLAGS += -framework OpenGL -framework Cocoa -L. -ltigr
+		LDFLAGS += -arch x86_64 -framework OpenGL -framework Cocoa -L. -ltigr
 	else ifeq ($(UNAME_S),Linux)
 		LDFLAGS += -s -lGLU -lGL -lX11 -ltigr
 	endif
@@ -18,7 +16,7 @@ endif
 all: $(PROGNAME).exe
 
 $(PROGNAME).exe: $(PROGNAME).mlb $(PROGNAME).sml libtigr.so
-	MLCOMP=mlkit $(MLKIT) -ldexe '$(LD) $(LDFLAGS)' -o $@ $<
+	MLCOMP=mlkit $(MLKIT) -ldexe '$(CC) $(LDFLAGS)' -o $@ $<
 
 libtigr.so: ../../lib/github.com/diku-dk/sml-tigr/clib/libtigr.so
 	cp $< $@

diff --git a/sml-examples/hello/Makefile b/sml-examples/hello/Makefile
@@ -1,14 +1,12 @@
 PROGNAME=hello
-
 MLKIT=mlkit
-LD=cc -arch x86_64
 
 ifeq ($(OS),Windows_NT)
 	LDFLAGS += -s -lopengl32 -lgdi32
 else
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Darwin)
-		LDFLAGS += -framework OpenGL -framework Cocoa -L. -ltigr
+		LDFLAGS += -arch x86_64 -framework OpenGL -framework Cocoa -L. -ltigr
 	else ifeq ($(UNAME_S),Linux)
 		LDFLAGS += -s -lGLU -lGL -lX11 -ltigr
 	endif
@@ -18,7 +16,7 @@ endif
 all: $(PROGNAME).exe
 
 $(PROGNAME).exe: $(PROGNAME).mlb $(PROGNAME).sml libtigr.so
-	MLCOMP=mlkit $(MLKIT) -ldexe '$(LD) $(LDFLAGS)' -o $@ $<
+	MLCOMP=mlkit $(MLKIT) -ldexe '$(CC) $(LDFLAGS)' -o $@ $<
 
 libtigr.so: ../../lib/github.com/diku-dk/sml-tigr/clib/libtigr.so
 	cp $< $@

diff --git a/sml-examples/mandel/Makefile b/sml-examples/mandel/Makefile
@@ -1,14 +1,12 @@
 PROGNAME=mandel
-
 MLKIT=mlkit
-LD=cc -arch x86_64
 
 ifeq ($(OS),Windows_NT)
 	LDFLAGS += -s -lopengl32 -lgdi32
 else
 	UNAME_S := $(shell uname -s)
 	ifeq ($(UNAME_S),Darwin)
-		LDFLAGS += -framework OpenGL -framework Cocoa -L. -ltigr
+		LDFLAGS += -arch x86_64 -framework OpenGL -framework Cocoa -L. -ltigr
 	else ifeq ($(UNAME_S),Linux)
 		LDFLAGS += -s -lGLU -lGL -lX11 -ltigr
 	endif
@@ -18,7 +16,7 @@ endif
 all: $(PROGNAME).exe
 
 $(PROGNAME).exe: $(PROGNAME).mlb $(PROGNAME).sml libtigr.so
-	MLCOMP=mlkit $(MLKIT) -ldexe '$(LD) $(LDFLAGS)' -o $@ $<
+	MLCOMP=mlkit $(MLKIT) -ldexe '$(CC) $(LDFLAGS)' -o $@ $<
 
 libtigr.so: ../../lib/github.com/diku-dk/sml-tigr/clib/libtigr.so
 	cp $< $@