From c4f94494d7bff49c57193b2a78b86fc197dd5b11 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Thu, 11 Nov 2021 23:51:50 +0300
Subject: [PATCH] minor update to standalone makefiles.
---
src/Makefile.darwin | 7 ++++---
src/Makefile.linux | 12 ++++++------
src/Makefile.mingw | 8 ++++----
src/Makefile.vc | 1 +
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/Makefile.darwin b/src/Makefile.darwin
index ddd8687..77bef81 100644
--- a/src/Makefile.darwin
+++ b/src/Makefile.darwin
@@ -5,9 +5,9 @@
INCLUDES = -Iinclude
ifeq ($(CROSS),)
-CC=gcc
+CC = gcc
else
-CC=$(CROSS)-gcc
+CC = $(CROSS)-gcc
endif
LD = $(CC)
@@ -34,7 +34,8 @@ all: $(DYLIB)
$(DYLIB): $(OBJ)
$(LD) -o $@ $(LDFLAGS) $(OBJ) $(LDLIBS)
- ln -s $(DYLIB) libSDL.dylib
+ ln -sf $(DYLIB) libSDL.dylib
+
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -o $@ -c $<
.m.o:
diff --git a/src/Makefile.linux b/src/Makefile.linux
index 8a83f5e..9f274bc 100644
--- a/src/Makefile.linux
+++ b/src/Makefile.linux
@@ -4,7 +4,7 @@
# change INCLUDES so it points to SDL2 headers directory:
INCLUDES = -Iinclude
-CC=gcc
+CC = gcc
LD = $(CC)
CPPFLAGS = -DNDEBUG -D_THREAD_SAFE -D_REENTRANT
@@ -12,7 +12,7 @@ CPPFLAGS+= -DSDL_DISABLE_IMMINTRIN_H
CFLAGS = -fPIC -O3 -Wall
LDFLAGS = -shared -Wl,-soname,libSDL-1.2.so.0
-#make sure this is supported:
+# make sure this is supported:
LDFLAGS+= -Wl,--no-undefined
LDLIBS = -ldl
@@ -21,15 +21,15 @@ SHLIB = libSDL-1.2.so.1.2.50
OBJ = SDL12_compat.o
.SUFFIXES:
-.SUFFIXES: .o .c .m
+.SUFFIXES: .o .c
all: $(SHLIB)
$(SHLIB): $(OBJ)
$(LD) -o $@ $(LDFLAGS) $(OBJ) $(LDLIBS)
- ln -s $(SHLIB) libSDL-1.2.so
- ln -s $(SHLIB) libSDL-1.2.so.0
- ln -s $(SHLIB) libSDL.so
+ ln -sf $(SHLIB) libSDL-1.2.so
+ ln -sf $(SHLIB) libSDL-1.2.so.0
+ ln -sf $(SHLIB) libSDL.so
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) -o $@ -c $<
diff --git a/src/Makefile.mingw b/src/Makefile.mingw
index 94b5b42..1c951ca 100644
--- a/src/Makefile.mingw
+++ b/src/Makefile.mingw
@@ -5,11 +5,11 @@
INCLUDES = -Iinclude
ifeq ($(CROSS),)
-CC=gcc
-RC=windres
+CC = gcc
+RC = windres
else
-CC=$(CROSS)-gcc
-RC=$(CROSS)-windres
+CC = $(CROSS)-gcc
+RC = $(CROSS)-windres
endif
LD = $(CC)
diff --git a/src/Makefile.vc b/src/Makefile.vc
index d234e15..151b4b2 100644
--- a/src/Makefile.vc
+++ b/src/Makefile.vc
@@ -31,6 +31,7 @@ all: $(DLLNAME)
$(DLLNAME): $(OBJ)
$(LD) /OUT:$@ $(LDFLAGS) $(OBJ) $(LDLIBS)
+
.c.obj:
$(CC) $(CFLAGS) $(CPPFLAGS) $(INCLUDES) /Fo$@ -c $<
.rc.res: