From: John Tsiombikas <nuclear@member.fsf.org>
Date: Mon, 23 Dec 2019 17:14:11 +0000 (+0200)
Subject: fixed procdata and 32bit build
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=commitdiff_plain;h=b0159ee29e4e616e4506d3cea5aee6ecc97aa93a

fixed procdata and 32bit build
---

diff --git a/GNUmakefile b/GNUmakefile
index 057ccfb..6e91ee8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -15,7 +15,7 @@ LDFLAGS = $(arch) -Llibs/imago -Llibs/mikmod -limago -lmikmod $(sdl_ldflags) -lm
 
 ifneq ($(shell uname -m), i386)
 	arch = -m32
-	sdl_ldflags = -L/usr/lib/i386-linux-gnu -lSDL
+	sdl_ldflags = -L/usr/lib/i386-linux-gnu -lSDL-1.2
 else
 	sdl_ldflags = `sdl-config --libs`
 endif
diff --git a/tools/img2bin/Makefile b/tools/img2bin/Makefile
index c9423c3..b6e9f4e 100644
--- a/tools/img2bin/Makefile
+++ b/tools/img2bin/Makefile
@@ -4,7 +4,7 @@ bin = img2bin
 root = ../..
 
 CFLAGS = -pedantic -Wall -g -I$(root)/libs/imago/src
-LDFLAGS = -L$(root)/libs/imago -limago
+LDFLAGS = -L$(root)/libs/imago -limago -lm
 
 $(bin): $(obj)
 	$(CC) -o $@ $(obj) $(LDFLAGS)
diff --git a/tools/procdata b/tools/procdata
index 25136ad..29076a6 100755
--- a/tools/procdata
+++ b/tools/procdata
@@ -8,7 +8,7 @@ fi
 
 # process embedded images
 if [ ! -f tools/img2bin/img2bin ]; then
-	make -C tools/img2bin/img2bin || exit 1
+	make -C tools/img2bin || exit 1
 fi
 alias img2bin=tools/img2bin/img2bin