version 1.153, 2004/10/21 15:12:01
|
version 1.154, 2004/10/28 14:22:08
|
Line 443 if test "$with_wx" = "yes" ; then
|
Line 443 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 --with-xrc --enable-shared=no" |
WXCONFIGURE_OPTION="--with-opengl --with-gtk --enable-gtk2 --enable-unicode --enable-ipc --with-xrc --enable-shared=no" |
fi |
fi |
if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then |
if test "$OS_OPTIONS" = "-D_UNIX -D_MACOS" ; then |
# MACOSX |
# MACOSX |
Line 489 if test "$with_wx" = "yes" ; then
|
Line 489 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" |
WXCONFIG_LIBS_PARAM="xrc,html,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" |