diff options
author | Steve Bennett <steveb@workware.net.au> | 2011-09-26 16:17:14 +1000 |
---|---|---|
committer | Steve Bennett <steveb@workware.net.au> | 2011-09-26 16:17:14 +1000 |
commit | 2d6673bdfd81f7508963a9c06fa99000350d6f43 (patch) | |
tree | a85c5827c81a9e957f10fa747b0b1901e188e2e8 /auto.def | |
parent | a36dd18cbc9c8b0483c2cefa49f5bbc2bd3b4e73 (diff) | |
download | jimtcl-2d6673bdfd81f7508963a9c06fa99000350d6f43.zip jimtcl-2d6673bdfd81f7508963a9c06fa99000350d6f43.tar.gz jimtcl-2d6673bdfd81f7508963a9c06fa99000350d6f43.tar.bz2 |
Get the SDL extension working again
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'auto.def')
-rw-r--r-- | auto.def | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -204,7 +204,7 @@ set withmod [join [opt-val {with-mod with-jim-extmod}]] # Tcl extensions set ext_tcl "stdlib glob tclcompat tree rlprompt oo binary" # Native extensions -set ext_c "load package readdir array clock exec file posix regexp signal aio eventloop pack syslog nvp readline mk sqlite sqlite3 win32" +set ext_c "load package readdir array clock exec file posix regexp signal aio eventloop pack syslog nvp readline mk sqlite sqlite3 win32 sdl" # C++ extensions set ext_cxx "mk" @@ -212,7 +212,7 @@ set ext_cxx "mk" # Tcl extensions which can be modules set ext_tcl_mod "glob tree rlprompt oo binary" # Native extensions which can be modules -set ext_c_mod "readdir array clock file posix regexp syslog readline pack mk sqlite sqlite3 win32" +set ext_c_mod "readdir array clock file posix regexp syslog readline pack mk sqlite sqlite3 win32 sdl" # All extensions set ext_all [concat $ext_c $ext_tcl] @@ -259,6 +259,8 @@ set needs(sqlite3) {cc-check-function-in-lib sqlite3_open sqlite3} set libdep(sqlite3) lib_sqlite3_open set needs(syslog) {have-feature syslog} set needs(win32) {have-feature windows} +set needs(sdl) {expr {[cc-check-function-in-lib SDL_SetVideoMode SDL] && [cc-check-function-in-lib rectangleRGBA SDL_gfx]}} +set libdep(sdl) {lib_SDL_SetVideoMode lib_rectangleRGBA} # First handle dependencies. If an extension is enabled, also enable its dependency foreach i [concat $ext_default $withext] { @@ -333,7 +335,9 @@ foreach i [lsort $ext_all] { msg-result "module" lappend extmod $i if {[info exists libdep($i)]} { - define-append LDLIBS_$i [get-define $libdep($i) ""] + foreach j $libdep($i) { + define-append LDLIBS_$i [get-define $j ""] + } } continue } @@ -356,7 +360,9 @@ foreach i [lsort $ext_all] { lappend ext $i if {[info exists libdep($i)]} { - define-append LDLIBS [get-define $libdep($i) ""] + foreach j $libdep($i) { + define-append LDLIBS [get-define $j ""] + } } } |