version 1.156, 2005/01/28 14:58:21
|
version 1.157, 2005/02/02 11:16:02
|
Line 453 if test "$with_wx" = "yes" ; then
|
Line 453 if test "$with_wx" = "yes" ; then
|
# --with-gtk use GTK+ |
# --with-gtk use GTK+ |
# --with-opengl use OpenGL (or Mesa) |
# --with-opengl use OpenGL (or Mesa) |
# --with-xrc use XRC resources system |
# --with-xrc use XRC resources system |
WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --with-xrc --enable-shared=no" |
# --disable-htmlhelp |
|
# --disable-html |
|
# --disable-docview |
|
# --disable-mdi |
|
# --disable-mdidoc |
|
# --disable-protocols |
|
# --disable-ftp |
|
# --disable-http |
|
# --disable-sound |
|
WXCONFIGURE_TUNNING_OPTION="--disable-htmlhelp --disable-html --disable-docview --disable-mdi --disable-mdidoc --disable-protocols --disable-ftp --disable-http --disable-sound" |
|
WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --with-xrc --enable-shared=no $WXCONFIGURE_TUNNING_OPTION" |
fi |
fi |
if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then |
if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then |
# MACOSX |
# MACOSX |
Line 499 if test "$with_wx" = "yes" ; then
|
Line 509 if test "$with_wx" = "yes" ; then
|
# setup libraries paths |
# setup libraries paths |
WX_LIBRARIES="" |
WX_LIBRARIES="" |
WX_LIBRARIES_EXTRA_PARAM="" |
WX_LIBRARIES_EXTRA_PARAM="" |
WXCONFIG_LIBS_PARAM="xrc,html,adv,core,xml,net" |
WXCONFIG_LIBS_PARAM="xrc,adv,core,xml,net" |
# GL is used ? |
# GL is used ? |
if test "$with_gl" = "yes" -o "$with_mesa" = "yes" ; then |
if test "$with_gl" = "yes" -o "$with_mesa" = "yes" ; then |
WXCONFIG_LIBS_PARAM="${WXCONFIG_LIBS_PARAM},gl" |
WXCONFIG_LIBS_PARAM="${WXCONFIG_LIBS_PARAM},gl" |