# HG changeset patch # User John Tsiombikas # Date 1393774851 -7200 # Node ID 7f0aed0fe2896bb1f6481b1eec1b6d3b537211df # Parent 3ba80928b530f9862f6180c0213fc3cb0d6a7a8c uberized the configure script diff -r 3ba80928b530 -r 7f0aed0fe289 Makefile.in --- a/Makefile.in Sun Mar 02 04:20:00 2014 +0200 +++ b/Makefile.in Sun Mar 02 17:40:51 2014 +0200 @@ -28,11 +28,11 @@ inc = -Isrc -Isrc/vr warn = -Wall -libs_ldflags = -limago -lanim -lpsys -lvmath -lresman +libs_ldflags = CFLAGS = -pedantic $(warn) $(dbg) $(pic) $(opt) $(inc) $(cfg_cflags) $(libs_cflags) CXXFLAGS = $(CFLAGS) -LDFLAGS = $(cfg_ldflags) $(libs_ldflags) -lgoat3d +LDFLAGS = $(cfg_ldflags) $(libs_ldflags) .PHONY: all all: $(lib_so) $(lib_a) diff -r 3ba80928b530 -r 7f0aed0fe289 configure --- a/configure Sun Mar 02 04:20:00 2014 +0200 +++ b/configure Sun Mar 02 17:40:51 2014 +0200 @@ -113,13 +113,14 @@ libgl='-framework OpenGL' else - emit '#include ' - if uname -s | grep MINGW; then libgl='-lopengl32 -lglu32' + emit '#include ' else libgl='-lGL -lGLU' fi + + emit '#include ' fi emit 'int main() { return 0; }' @@ -168,6 +169,31 @@ rm -f $tmpfile_bin $tmpfile_src } +check_lib() +{ + libname=$1 + hdr=$2 + lib=-l$libname + tmpfile_bin=${tmpfile_prefix}check_$libname + tmpfile_src=${tmpfile_bin}.cc + + echo -n "checking for $libname ... " + + begin_emit $tmpfile_src + emit "#include <${hdr}>" + emit 'int main() {}' + + if ! c++ -o $tmpfile_bin $tmpfile_src $lib -lpthread >$build_log 2>&1; then + echo not found! + exit 1 + else + echo ok + fi + + LDFLAGS="$LDFLAGS $lib" + rm -f $tmpfile_bin $tmpfile_src +} + gen_config() { echo "generating: src/config.h ..." @@ -227,6 +253,12 @@ check_glut check_glew if $vr; then check_ovr; fi +check_lib vmath vmath/vmath.h +check_lib imago imago2.h +check_lib anim anim/anim.h +check_lib psys psys/psys.h +check_lib resman resman.h +check_lib goat3d goat3d.h gen_makefile gen_config