wxX11 compiles and links now. I wonder why there is
no wxToolBar class in /src/univ, though. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
2
configure
vendored
2
configure
vendored
@@ -12183,7 +12183,7 @@ rm -f conftest*
|
||||
fi
|
||||
|
||||
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext -lXt -lX11"
|
||||
TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ"
|
||||
TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ \${top_srcdir}/src/univ/themes"
|
||||
TOOLKIT=X11
|
||||
GUIDIST=X11_DIST
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
|
||||
|
@@ -1882,7 +1882,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
|
||||
fi
|
||||
|
||||
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext -lXt -lX11"
|
||||
TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ"
|
||||
TOOLKIT_VPATH="\${top_srcdir}/src/x11 \${top_srcdir}/src/univ \${top_srcdir}/src/univ/themes"
|
||||
TOOLKIT=X11
|
||||
GUIDIST=X11_DIST
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
|
||||
|
@@ -625,7 +625,6 @@ palette.cpp X11
|
||||
pen.cpp X11
|
||||
region.cpp X11
|
||||
settings.cpp X11
|
||||
toolbar.cpp X11
|
||||
toplevel.cpp X11
|
||||
timer.cpp X11
|
||||
utils.cpp X11
|
||||
|
@@ -26,7 +26,6 @@ ALL_SOURCES = \
|
||||
x11/region.cpp \
|
||||
x11/settings.cpp \
|
||||
x11/timer.cpp \
|
||||
x11/toolbar.cpp \
|
||||
x11/toplevel.cpp \
|
||||
x11/utils.cpp \
|
||||
x11/window.cpp \
|
||||
@@ -648,7 +647,6 @@ GUIOBJS = \
|
||||
region.o \
|
||||
settings.o \
|
||||
timer.o \
|
||||
toolbar.o \
|
||||
toplevel.o \
|
||||
utils.o \
|
||||
window.o \
|
||||
|
Reference in New Issue
Block a user