Update makefiles

Makefile

@@ -1,7 +1,7 @@
 # I personally don't care if you steal this makefile. --GM
 
 #-Wno-unused-but-set-variable $(CFLAGS_EXTRA)
-CFLAGS = -fno-strict-aliasing -g `sdl-config --cflags` -Wall -Wextra \
+CFLAGS = -fno-strict-aliasing -g -Wall -Wextra \
 	-Wno-unused-variable -Wno-unused-parameter \
 	$(CFLAGS_EXTRA) \
 	-Iinclude \
@@ -11,12 +11,12 @@ CFLAGS = -fno-strict-aliasing -g `sdl-config --cflags` -Wall -Wextra \
 	$(HEADERS_ENet) \
 	$(HEADERS_Lua)
 
-HEADERS_SDL = `sdl-config --cflags`
+HEADERS_SDL = `sdl2-config --cflags`
 HEADERS_ENet = `pkg-config libenet --cflags`
 HEADERS_Lua = `./findlua.sh --cflags`
 
-LDFLAGS = -g -I/usr/local/include $(LDFLAGS_EXTRA) 
-LIBS_SDL = `sdl-config --libs`
+LDFLAGS = -g -I/usr/local/include $(LDFLAGS_EXTRA)
+LIBS_SDL = `sdl2-config --libs`
 LIBS_ENet = `pkg-config libenet --libs`
 LIBS_Lua = `./findlua.sh --libs`
 # Lua is not an acronym. Get used to typing it with lower case u/a.
@@ -29,4 +29,3 @@ BINNAME = iceball
 OBJDIR = build/unix_gl
 
 include main.make
-

Makefile.mingw

@@ -22,7 +22,7 @@ CFLAGS = -O2 -fno-strict-aliasing -g -Wall -Wextra \
 	#-msse2 -mfpmath=sse \
 
 LDFLAGS = -g $(LDFLAGS_EXTRA)
-LIBS_SDL = -lSDLmain -lSDL
+LIBS_SDL = -lSDL2main -lSDL2
 LIBS_ENet = -lenet -lwinmm -lws2_32
 LIBS_Lua = -llua
 # Lua is not an acronym. Get used to typing it with lower case u/a.

Makefile.osx

@@ -1,20 +1,22 @@
 # I personally don't care if you steal this makefile. --GM
 
-CC = gcc
-CFLAGS = -pg -O2 -fno-strict-aliasing -g `sdl-config --cflags` -Wall -Wextra \
+CFLAGS = -fno-strict-aliasing -g -Wall -Wextra \
 	-Wno-unused-variable -Wno-unused-parameter \
 	$(CFLAGS_EXTRA) \
 	-DUSE_OPENGL -DAPPLE \
 	-I $(INCDIR) -Ixlibinc \
+	$(HEADERS_SDL) \
+	$(HEADERS_ENet) \
 	$(HEADERS_Lua)
 
-# Uncomment this if you are Debian or Debian-derived
-HEADERS_Lua = #-I /usr/include/lua5.1
+HEADERS_SDL = `sdl2-config --cflags`
+HEADERS_ENet = `pkg-config libenet --cflags`
+HEADERS_Lua = `./findlua.sh --cflags`
 
-LDFLAGS = -pg -g $(LDFLAGS_EXTRA) 
-LIBS_SDL = `sdl-config --libs`
-LIBS_ENet = -lenet
-LIBS_Lua = -llua
+LDFLAGS = -g -I/usr/local/include $(LDFLAGS_EXTRA)
+LIBS_SDL = `sdl2-config --libs`
+LIBS_ENet = `pkg-config libenet --libs`
+LIBS_Lua = `./findlua.sh --libs`
 # Lua is not an acronym. Get used to typing it with lower case u/a.
 LIBS_zlib = -lz
 LIBS_sackit = -lsackit

findlua.sh

@@ -16,4 +16,3 @@ else
 	echo Lua 5.1 not found - tweak findlua.sh to suit your liking. 1>&2
 	echo Note, Iceball does not support Lua 5.2. 1>&2
 fi
-