# HG changeset patch # User John Tsiombikas # Date 1330053467 -7200 # Node ID 3d6ee9fb9ac1850ba89fe34cb557b789ffbc712f # Parent 46e90f9c1e0f4850d2d01ef5e3afba9e06e4be6d - added a cflags declaration for modules files diff -r 46e90f9c1e0f -r 3d6ee9fb9ac1 Makefile.in --- a/Makefile.in Tue Jul 05 06:19:31 2011 +0300 +++ b/Makefile.in Fri Feb 24 05:17:47 2012 +0200 @@ -23,7 +23,7 @@ AR = ar CC = gcc -CFLAGS = -pedantic -Wall -g -fPIC -Iinclude -Isrc $(CFLAGS_extra) +CFLAGS = -pedantic -Wall -g -fPIC -Iinclude -Isrc $(wsys_cflags) $(CFLAGS_extra) LDFLAGS = $(wsys_libs) .PHONY: all diff -r 46e90f9c1e0f -r 3d6ee9fb9ac1 configure --- a/configure Tue Jul 05 06:19:31 2011 +0300 +++ b/configure Fri Feb 24 05:17:47 2012 +0200 @@ -28,6 +28,11 @@ extract $1 mac-framework } +get_cflags() +{ + extract $1 cflags +} + get_usedef() { grep '#ifdef *USE_WSYS_MODULE' $1 | sed 's/^.*\(USE_WSYS_MODULE_.*\)/\1/' @@ -104,6 +109,8 @@ fi fi + cfl=`get_cflags $m` + name=`echo $m | sort | sed 's/src\/wsys_//' | sed 's/\.c//' | sed 's/\.m//'` message -n "-> trying module $name (needs: $dep) ... " @@ -113,6 +120,7 @@ elif try_link "$dep"; then message ok + cflags="$cflags $cfl" libs="$libs $dep" # emmit the USE_ define in config.h @@ -126,6 +134,9 @@ fi done +if [ -n "$cflags" ]; then + message "will compile with: $cflags" +fi message "Will link with: $libs" # wrap up the modules.c file @@ -139,6 +150,7 @@ message "install prefix: $prefix" echo "PREFIX = $prefix" >Makefile +echo "wsys_cflags = $cflags" >>Makefile echo "wsys_libs = $libs" >>Makefile cat Makefile.in >>Makefile diff -r 46e90f9c1e0f -r 3d6ee9fb9ac1 src/wsys_sdl.c --- a/src/wsys_sdl.c Tue Jul 05 06:19:31 2011 +0300 +++ b/src/wsys_sdl.c Fri Feb 24 05:17:47 2012 +0200 @@ -1,11 +1,12 @@ /* SimplyGL window system module for SDL */ +/* cflags: `sdl-config --cflags` */ /* link-with: `sdl-config --libs` */ #include "config.h" #ifdef USE_WSYS_MODULE_SDL -#include +#include #include "sgl.h" #include "wsys.h"