reorganization

Author: jtsiomb

.gitignore

@@ -24,3 +24,4 @@ core
 *.tar
 *.png
 tools/tilerend/tilerend
+config.mk

Makefile.sdl renamed to Makefile.in

@@ -1,25 +1,19 @@
-src = $(wildcard src/*.c) $(wildcard src/sdl/*.c)
+include config.mk
+
 obj = $(src:.c=.o)
 dep = $(src:.c=.d)
-bin = sdlgame
-
-#opt ?= -O3
-dbg ?= -g
-warn = -pedantic -Wall
-
-incdir = -Isrc -Isrc/sdl -Ilibs/imago/src
-libdir = -Llibs/unix
 
-CFLAGS = $(warn) $(opt) $(dbg) $(incdir) `sdl-config --cflags` -MMD
-LDFLAGS = $(libdir) `sdl-config --libs` -limago -lm
+incdir = -Isrc -Ilibs/imago/src
+libdir = -Llibs/$(outdir)
 
-.PHONY: all
-all: $(bin) data
+CFLAGS = $(arch) $(warn) $(opt) $(dbg) $(incdir) $(CFLAGS_sys) $(depgen)
+LDFLAGS = $(libdir) $(LDFLAGS_sys) -limago -lm
 
 $(bin): $(obj) libs
 	$(CC) -o $@ $(obj) $(LDFLAGS)
 
--include $(dep)
+.c.o:
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 .PHONY: clean
 clean:
@@ -46,10 +40,10 @@ cleanlibs: clean-imago
 
 .PHONY: imago
 imago:
-	$(MAKE) -C libs/imago
+	cd libs/imago; $(MAKE)
 
 .PHONY: clean-imago
 clean-imago:
-	$(MAKE) -C libs/imago clean
+	cd libs/imago; $(MAKE) clean
 
 # vi:ft=make:

Makefile.mingw

@@ -28,3 +28,5 @@ libs\w32\imago.lib:
 	cd libs\imago
 	$(MAKE) /nologo -f Makefile.msvc
 	cd ..\..
+
+# vi:ft=make:

Makefile.unix

@@ -28,23 +28,80 @@ for arg in $*; do
 	esac
 done
 
+detect_compiler()
+{
+	printf 'Detecting compiler: '
+
+	if [ -z "$CC" ]; then
+		CC=cc; export CC
+	fi
+
+	testprog=/tmp/isorpg_cfgtest.c
+	echo '#ifndef __GNUC__' >$testprog
+	echo '#error nogcc' >>$testprog
+	echo '#endif' >>$testprog
+	echo 'int main(void) { return 0; }' >>$testprog
+	if $CC -o /dev/null $testprog 2>/dev/null; then
+		cc_gcc=true
+		echo 'GCC or compatible'
+	else
+		cc_gcc=false
+		echo 'not GCC'
+	fi
+	rm -f $testprog
+}
+
+sys=`uname -s | sed 's/IRIX.*/IRIX/; s/MINGW.*/mingw/'`
+if [ $sys = mingw ]; then
+	outdir=w32
+elif [ $sys = IRIX ]; then
+	outdir=unix
+	if $cc_gcc; then
+		arch=-mips3
+	else
+		arch='-n32 -mips3'
+	fi
+else
+	outdir=unix
+fi
+
+detect_compiler
+
 case $build in
 sdl)
-	makefile=Makefile.sdl
+	makefile=Makefile.in
 	buildname=SDL
+	srclist='src/*.c src/sdl/*.c'
+	CFLAGS_sys=`sdl-config --cflags`
+	LDFLAGS_sys=`sdl-config --libs`
 	;;
+
 gl|opengl)
-	makefile=Makefile.gl
+	makefile=Makefile.in
 	buildname=OpenGL
+	srclist='src/*.c src/gl/*.c'
+	if [ $sys = mingw ]; then
+		LDFLAGS_sys='-lopengl32'
+	elif [ $sys = Darwin ]; then
+		LDFLAGS_sys='-framework OpenGL'
+	else
+		LDFLAGS_sys='-lGL'
+	fi
 	;;
-x11)
-	makefile=Makefile.unix
+
+x11|unix)
+	makefile=Makefile.in
 	buildname=X11
+	srclist='src/*.c src/unix/*.c'
+	LDFLAGS_sys='-lX11'
 	;;
+
 win32|mingw|directx|dx)
-	makefile=Makefile.mingw
+	makefile=Makefile.win
 	buildname=DirectX
+	srclist='src/*.c src/win32/*.c'
 	;;
+
 *)
 	echo "unrecognized build target: $build" >&2
 	exit 1
@@ -56,13 +113,43 @@ echo "optimizations: $opt"
 echo "debug symbols: $dbg"
 
 echo "# Makefile for $buildname build" >Makefile
+echo "# Config file for $buildname build" >config.mk
+
+echo 'src = \' >>Makefile
+for i in `echo $srclist | sort`; do
+	echo "  $i \\" >>Makefile
+done
+echo '' >>Makefile
+echo 'bin = game' >>Makefile
+echo '' >>Makefile
+
 if $opt; then
 	if [ `uname -s` = SunOS ]; then
-		echo 'opt = -fast' >>Makefile
+		echo 'opt = -fast' >>config.mk
 	else
-		echo 'opt = -O3' >>Makefile
+		echo 'opt = -O3' >>config.mk
 	fi
 fi
-$dbg && echo 'dbg = -g' >>Makefile
-echo "# $makefile" >>Makefile
+$dbg && echo 'dbg = -g' >>config.mk
+echo >>config.mk
+
+if $cc_gcc; then
+	echo 'depgen = -MMD' >>config.mk
+	echo 'warn = -pedantic -Wall' >>config.mk
+	echo >>config.mk
+
+	echo '.PHONY: all' >>Makefile
+	echo 'all: $(bin)' >>Makefile
+	echo >>Makefile
+	echo '-include $(dep)' >>Makefile
+	echo >>Makefile
+fi
+
+echo "outdir = $outdir" >>config.mk
+[ -n "$arch" ] && echo "arch = $arch" >>config.mk
+[ -n "$CFLAGS_sys" ] && echo "CFLAGS_sys = $CFLAGS_sys" >>config.mk
+[ -n "$LDFLAGS_sys" ] && echo "LDFLAGS_sys = $LDFLAGS_sys" >>config.mk
+echo >>config.mk
+
+echo "# ---- $makefile" >>Makefile
 cat $makefile >>Makefile

Makefile.msvc renamed to Makefile.vc

@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "winjam24"=.\winjam24.dsp - Package Owner=<4>
+Project: "isorpg"=.\isorpg.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -30,7 +30,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "winjam24_sdl"=.\winjam24_sdl.dsp - Package Owner=<4>
+Project: "isorpg_sdl"=.\isorpg_sdl.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

configure

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35222.181
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winjam24", "winjam24.vcxproj", "{CE79BA15-397E-4256-8701-74CBFFEDA6DE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isorpg", "isorpg.vcxproj", "{CE79BA15-397E-4256-8701-74CBFFEDA6DE}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A6659898-9BAE-4491-B4A8-F3E3204E11B1} = {A6659898-9BAE-4491-B4A8-F3E3204E11B1}
 	EndProjectSection

winjam24.dsp renamed to isorpg.dsp

@@ -22,7 +22,7 @@
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{ce79ba15-397e-4256-8701-74cbffeda6de}</ProjectGuid>
-    <RootNamespace>winjam24</RootNamespace>
+    <RootNamespace>isorpg</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />