fix stuff

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@619 b9cfdab3-6d41-4d17-bbe4-086880011989

Koakumafile

@@ -8,14 +8,15 @@ proc run {project_name} {
 		RunCommand "mv doxygen/html /var/www/milsko-doxygen"
 	} else {
 		foreach target {"Linux" "Win32" "Win64"} {
-			RunCommand "make clean"
+			RunCommand "make distclean || true"
 			if { "$target" == "Linux" } {
-				RunCommand "make -j4 VULKAN_NO_STRING_HELPER=1"
+				RunCommand "./configure --enable-opengl --enable-vulkan --without-vulkan-string-helper"
 			} elseif { "$target" == "Win32" } {
-				RunCommand "make -j4 VULKAN=0 USE_FREETYPE2=0 USE_STB_TRUETYPE=1 TARGET=Windows GCC=i686-w64-mingw32-"
+				RunCommand "./configure --enable-opengl --enable-stb-truetype --disable-freetype2 --cross CC=i686-w64-mingw32-gcc"
 			} elseif { "$target" == "Win64" } {
-				RunCommand "make -j4 VULKAN=0 USE_FREETYPE2=0 USE_STB_TRUETYPE=1 TARGET=Windows GCC=x86_64-w64-mingw32-"
-			}
+				RunCommand "./configure --enable-opengl --enable-stb-truetype --disable-freetype2 --cross CC=x86_64-w64-mingw32-gcc"
+			}
+			RunCommand "make -j4"
 		}
 	}
 }

Makefile.m4

@@ -39,7 +39,8 @@ dnl
 ifdef([target],[],[define([target],esyscmd([uname -s | xargs printf '%s']))])dnl
 syscmd([test -f ]m4/ostype/target.m4)dnl
 ifelse(sysval,[0],[include(m4/ostype/target.m4)],[errprint([M4 for your target (]m4/ostype/target.m4[) was not found, please make one
-])m4exit(1)])dnl
+])m4exit(1)dnl
+])dnl
 dnl
 include(m4/toplevel/options.m4)dnl
 dnl
@@ -86,4 +87,4 @@ distclean: clean
 	rm -f Makefile
 
 clean:
-	rm -f examples_targets */*.o */*/*.o */*/*/*.o
+	rm -f examples_targets */*.o */*/*.o */*/*/*.o src/*.dll src/*.so src/*.a

configure

@@ -1,17 +1,108 @@
 #!/bin/sh
 # $Id$
-FLAGS="-Duse_freetype2 -Duse_stb_image -Dbuild_opengl -Dbuild_vulkan"
+FLAGS=""
+
+feat_cross=false
+feat_stb_image=true
+feat_stb_truetype=false
+feat_freetype2=true
+feat_opengl=false
+feat_vulkan=false
+feat_vulkan_string_helper=true
 
 for i in $@; do
 	case "$i" in
 		--help|-h)
 			echo "Configuration utility for Milsko Toolkit"
+			echo ""
+			echo "Usage: $0 [options]"
+			echo ""
+			echo "Options:"
+			echo "  -h --help    Display this help and exit"
+			echo "     --cross   Indicate cross-compilation"
+			echo ""
+			echo "Features:"
+			echo "  --enable-stb-image               Build and use stb_image instead of libjpeg/libpng"
+			echo "  --enable-stb-truetype            Build stb_truetype"
+			echo "  --enable-freetype2               Use FreeType2"
+			echo "  --enable-opengl                  Build OpenGL widget"
+			echo "  --enable-vulkan                  Build Vulkan widget"
+			echo "  --disable-FEATURE                Do not use FEATURE"
+			echo ""
+			echo "  --without-vulkan-string-helper   Do not use Vulkan string helper"
+			echo "  --without-FEATURE                Do not use FEATURE"
+			exit 0
+			;;
+		--cross)
+			feat_cross=true
+			;;
+		--enable-*|--disable-*)
+			if [ "`echo $i | cut -d- -f3`" = "enable" ]; then
+				eval feat_`echo $i | cut -d- -f4- | tr - _`=true
+			else
+				eval feat_`echo $i | cut -d- -f4- | tr - _`=false
+			fi
+			;;
+		--with-*|--without-*)
+			if [ "`echo $i | cut -d- -f3`" = "with" ]; then
+				eval feat_`echo $i | cut -d- -f4- | tr - _`=true
+			else
+				eval feat_`echo $i | cut -d- -f4- | tr - _`=false
+			fi
+			;;
+		*=*)
+			eval $i
 			;;
 	esac
 done
 
+if $feat_cross; then
+	FLAGS="$FLAGS -Dcross_build"
+fi
+
+if [ ! "x$CC" = "x" ]; then
+	FLAGS="$FLAGS -Dcc=$CC"
+fi
+
+if $feat_vulkan_string_helper; then
+	FLAGS="$FLAGS -Duse_vulkan_string_helper"
+fi
+
+if $feat_stb_image; then
+	FLAGS="$FLAGS -Duse_stb_image"
+fi
+
+if $feat_stb_image; then
+	FLAGS="$FLAGS -Duse_stb_image"
+fi
+
+if $feat_stb_truetype; then
+	FLAGS="$FLAGS -Duse_stb_truetype"
+fi
+
+if $feat_opengl; then
+	FLAGS="$FLAGS -Dbuild_opengl"
+fi
+
+if $feat_vulkan; then
+	FLAGS="$FLAGS -Dbuild_vulkan"
+fi
+
+printf "Generating Makefile... "
+
 if ! m4 $FLAGS Makefile.m4 > Makefile; then
 	echo "(M4 exited with non-zero status)"
 	rm -f Makefile
 	exit 1
 fi
+echo "Done"
+
+echo "Features:"
+echo "  stb_image           : $feat_stb_image"
+echo "  stb_truetype        : $feat_stb_truetype"
+echo "  FreeType2           : $feat_freetype2"
+echo "  OpenGL              : $feat_opengl"
+echo "  Vulkan              : $feat_vulkan"
+if $feat_vulkan; then
+echo "  Vulkan String Helper: $feat_vulkan_string_helper"
+fi

external/deps.mk

@@ -1,9 +0,0 @@
-# $Id$
-DEPINC += -Iexternal/libz/include
-L_OBJS += external/libz/src/adler32.o external/libz/src/compress.o external/libz/src/crc32.o external/libz/src/deflate.o external/libz/src/gzclose.o external/libz/src/gzlib.o external/libz/src/gzread.o external/libz/src/gzwrite.o external/libz/src/infback.o external/libz/src/inffast.o external/libz/src/inflate.o external/libz/src/inftrees.o external/libz/src/trees.o external/libz/src/uncompr.o external/libz/src/zutil.o 
-
-DEPINC += -Iexternal/libjpeg/include
-L_OBJS += external/libjpeg/src/cdjpeg.o external/libjpeg/src/jaricom.o external/libjpeg/src/jcapimin.o external/libjpeg/src/jcapistd.o external/libjpeg/src/jcarith.o external/libjpeg/src/jccoefct.o external/libjpeg/src/jccolor.o external/libjpeg/src/jcdctmgr.o external/libjpeg/src/jchuff.o external/libjpeg/src/jcinit.o external/libjpeg/src/jcmainct.o external/libjpeg/src/jcmarker.o external/libjpeg/src/jcmaster.o external/libjpeg/src/jcomapi.o external/libjpeg/src/jcparam.o external/libjpeg/src/jcprepct.o external/libjpeg/src/jcsample.o external/libjpeg/src/jctrans.o external/libjpeg/src/jdapimin.o external/libjpeg/src/jdapistd.o external/libjpeg/src/jdarith.o external/libjpeg/src/jdatadst.o external/libjpeg/src/jdatasrc.o external/libjpeg/src/jdcoefct.o external/libjpeg/src/jdcolor.o external/libjpeg/src/jddctmgr.o external/libjpeg/src/jdhuff.o external/libjpeg/src/jdinput.o external/libjpeg/src/jdmainct.o external/libjpeg/src/jdmarker.o external/libjpeg/src/jdmaster.o external/libjpeg/src/jdmerge.o external/libjpeg/src/jdpostct.o external/libjpeg/src/jdsample.o external/libjpeg/src/jdtrans.o external/libjpeg/src/jerror.o external/libjpeg/src/jfdctflt.o external/libjpeg/src/jfdctfst.o external/libjpeg/src/jfdctint.o external/libjpeg/src/jidctflt.o external/libjpeg/src/jidctfst.o external/libjpeg/src/jidctint.o external/libjpeg/src/jmemmgr.o external/libjpeg/src/jmemnobs.o external/libjpeg/src/jquant1.o external/libjpeg/src/jquant2.o external/libjpeg/src/jutils.o external/libjpeg/src/rdbmp.o external/libjpeg/src/rdcolmap.o external/libjpeg/src/rdgif.o external/libjpeg/src/rdppm.o external/libjpeg/src/rdrle.o external/libjpeg/src/rdswitch.o external/libjpeg/src/rdtarga.o external/libjpeg/src/transupp.o external/libjpeg/src/wrbmp.o external/libjpeg/src/wrgif.o external/libjpeg/src/wrppm.o external/libjpeg/src/wrrle.o external/libjpeg/src/wrtarga.o
-
-DEPINC += -Iexternal/libpng/include
-L_OBJS += external/libpng/src/png.o external/libpng/src/pngerror.o external/libpng/src/pngget.o external/libpng/src/pngmem.o external/libpng/src/pngpread.o external/libpng/src/pngread.o external/libpng/src/pngrio.o external/libpng/src/pngrtran.o external/libpng/src/pngrutil.o external/libpng/src/pngset.o external/libpng/src/pngtrans.o external/libpng/src/pngwio.o external/libpng/src/pngwrite.o external/libpng/src/pngwtran.o external/libpng/src/pngwutil.o

m4/options/backend.m4

@@ -2,13 +2,16 @@ dnl $Id$
 ifdef([use_x11],[add_cflag([-DUSE_X11])dnl
 add_lib([-lX11 -lXrender -lXcursor])dnl
 new_object([src/backend/x11.c])dnl
-define([gl_lib],[-lGL -lGLU])])dnl
+define([gl_lib],[-lGL -lGLU])dnl
+])dnl
 dnl
 ifdef([use_gdi],[add_cflag([-DUSE_GDI])dnl
 add_lib([-lgdi32])dnl
 new_object([src/backend/gdi.c])dnl
-define([gl_lib],[-lopengl32 -lglu32])])dnl
+define([gl_lib],[-lopengl32 -lglu32])dnl
+])dnl
 dnl
 ifdef([use_darwin],[add_cflag([-DUSE_DARWIN -DSTBI_NO_THREAD_LOCALS])dnl
 new_object([src/backend/mac/*.c])dnl
-define([gl_lib],[])])dnl
+define([gl_lib],[])dnl
+])dnl

m4/options/vulkan.m4

@@ -1,4 +1,6 @@
 dnl $Id$
 ifdef([build_vulkan],[new_object([src/widget/vulkan.c])dnl
 new_example([examples/vkdemos/vulkan])dnl
+ifdef([use_vulkan_string_helper],[add_comdef([-DHAS_VK_ENUM_STRING_HELPER])dnl
+])dnl
 ])dnl

m4/toplevel/options.m4

@@ -8,10 +8,13 @@ new_object([external/libjpeg/src/*.c])dnl
 new_object([external/libpng/src/*.c])dnl
 add_cflag([-Iexternal/libz/include])dnl
 add_cflag([-Iexternal/libjpeg/include])dnl
-add_cflag([-Iexternal/libpng/include])])dnl
+add_cflag([-Iexternal/libpng/include])dnl
+])dnl
 dnl
 ifdef([use_stb_truetype],[add_cflag([-DUSE_STB_TRUETYPE])])dnl
 dnl
 ifdef([use_freetype2],[add_cflag([-DUSE_FREETYPE2])dnl
 ifdef([cross_build],[],[add_cflag(esyscmd([pkg-config --cflags freetype2 | xargs printf '%s ']))dnl
-add_lib(esyscmd([pkg-config --libs freetype2 | xargs printf '%s ']))])])dnl
+add_lib(esyscmd([pkg-config --libs freetype2 | xargs printf '%s ']))dnl
+])dnl
+])dnl

m4/toplevel/rules.m4

@@ -26,7 +26,7 @@ define([new_object],[pushdef([source])define([source],patsubst(patsubst(patsubst
 ],[ ]),[ $],[]))define([library_targets],ifelse(library_targets,[],[source],[library_targets source]))popdef([source])])dnl
 define([print_library_targets],[foreach(x,space_to_comma(library_targets),[pushdef([source])define([source],[patsubst(x,[\]object_suffix[$],[.c])])dnl
 x: source
-	$(CC) -c -fPIC $(INCDIR) $(CFLAGS) -o x source
+	$(CC) -c -fPIC $(CFLAGS) $(INCDIR) -o x source
 popdef([source])])])dnl
 dnl
 define([examples_targets],[])dnl