Corrected PNG etc include paths
Added install for Motif (not tested) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
parent
a47ad26244
commit
583a65787f
58
BuildCVS.txt
58
BuildCVS.txt
@ -46,8 +46,8 @@ and its make.exe).
|
||||
-> type: cd c:\wxWin\src\msw
|
||||
-> type: make -f makefile.g95
|
||||
|
||||
II) Unix ports using plain makefiles.
|
||||
--------------------------------------
|
||||
II) Unix ports
|
||||
--------------
|
||||
|
||||
Building wxGTK or wxMotif completely without configure
|
||||
won't ever work, but there is now a new makefile system
|
||||
@ -63,21 +63,11 @@ as ~/wxWindows (this is actually not really needed).
|
||||
-> type: cd mybuild
|
||||
-> type: ../configure --with-motif
|
||||
or type: ../configure --with-gtk
|
||||
-> type: cd src/gtk
|
||||
or type: cd src/motif
|
||||
-> type: make -f makefile.unx
|
||||
|
||||
You will then find the shared library in in the lib path of
|
||||
the build directory. There is currently no install method,
|
||||
so you'll have to create a symlink to /usr/local/lib and run
|
||||
ldconfig or whatever is needed to make that library known
|
||||
to your system.
|
||||
|
||||
In order to test the sample, go to mybuild/src/gtk again and
|
||||
type: make -f makefile.unx samples
|
||||
which will copy the entire samples directory to the build
|
||||
directory, such as mybuild/samples
|
||||
|
||||
-> type: make
|
||||
-> type: su <type root password>
|
||||
-> type: make install
|
||||
-> type: ldconfig
|
||||
-> type: exit
|
||||
|
||||
III) Windows using configure
|
||||
----------------------------------------
|
||||
@ -91,40 +81,6 @@ ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.
|
||||
Of course, you can also build the library using plain makefiles (see
|
||||
section I).
|
||||
|
||||
IV) Unix using configure
|
||||
----------------------------------------
|
||||
|
||||
a) You have all the newest and greatest GNU tools installed on your system
|
||||
and in the same directory hierachy (e.g. either all tools in /usr or all
|
||||
in /usr/local), these tools are:
|
||||
- GNU libtool 1.2e (1.3 doesn't work here)
|
||||
- GNU autoconf 2.13 (including autoheader 2.13)
|
||||
- GNU automake 1.4 (including aclocal 1.4)
|
||||
and possibly but not forcibly
|
||||
- GNU make 3.76.1
|
||||
- GNU C++ (EGCS)
|
||||
|
||||
-> Go to the base directory
|
||||
-> type: ./autogen.sh
|
||||
|
||||
b) You don't know what autos are and have no driver's licence anyway:
|
||||
|
||||
-> Go to the testconf directory
|
||||
-> type: ./apply
|
||||
|
||||
a+b) Then proceed in either case with:
|
||||
|
||||
-> Choose a directory name that seems fit for building wxWindows, e.g. mybuild
|
||||
-> Go the base directory
|
||||
-> type: mkdir mybuild
|
||||
-> type: cd mybuild
|
||||
-> type: ../configure --with-gtk
|
||||
or type: ../configure --with-motif
|
||||
or type: ../configure --with-wine
|
||||
-> type make
|
||||
-> drink lots of coffee and go shopping
|
||||
|
||||
|
||||
V) MacOS
|
||||
----------------------------------------
|
||||
|
||||
|
||||
23
configure.in
23
configure.in
@ -1969,13 +1969,13 @@ dnl ---------------------------------------------------------------------------
|
||||
ZLIB_INCLUDE=
|
||||
if test "$wxUSE_ZLIB" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_ZLIB)
|
||||
ZLIB_INCLUDE="-I\${srcdir}/../zlib"
|
||||
ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
|
||||
fi
|
||||
|
||||
PNG_INCLUDE=
|
||||
if test "$wxUSE_LIBPNG" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_LIBPNG)
|
||||
PNG_INCLUDE="-I\${srcdir}/../png"
|
||||
PNG_INCLUDE="-I\${top_srcdir}/src/png"
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
|
||||
fi
|
||||
|
||||
@ -1986,7 +1986,7 @@ fi
|
||||
JPEG_INCLUDE=
|
||||
if test "$wxUSE_LIBJPEG" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_LIBJPEG)
|
||||
JPEG_INCLUDE="-I\${srcdir}/../jpeg"
|
||||
JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
@ -2658,13 +2658,16 @@ AC_OUTPUT([
|
||||
],
|
||||
[
|
||||
chmod +x wx-config
|
||||
dnl The following line is more elegant but test -e is not supported by all
|
||||
dnl test varieties.
|
||||
dnl if test ! -e include/wx/${TOOLKIT_DIR}/setup.h; then
|
||||
cat include/wx/${TOOLKIT_DIR}/setup.h >/dev/null 2>&1
|
||||
if test $? != 0; then
|
||||
${LN_S} `pwd`/setup.h include/wx/${TOOLKIT_DIR}/setup.h
|
||||
fi
|
||||
if test ! -d include; then
|
||||
mkdir include
|
||||
fi
|
||||
if test ! -d include/wx; then
|
||||
mkdir include/wx
|
||||
fi
|
||||
if test ! -d include/wx/${TOOLKIT_DIR}; then
|
||||
mkdir include/wx/${TOOLKIT_DIR}
|
||||
fi
|
||||
cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
|
||||
],
|
||||
[
|
||||
LN_S="${ac_cv_prog_LN_S}"
|
||||
|
||||
@ -625,6 +625,64 @@ wave.h K
|
||||
win_gtk.h K
|
||||
window.h K
|
||||
|
||||
accel.h F
|
||||
app.h F
|
||||
bitmap.h F
|
||||
bmpbuttn.h F
|
||||
brush.h F
|
||||
button.h F
|
||||
checkbox.h F
|
||||
checklst.h F
|
||||
choice.h F
|
||||
clipbrd.h F
|
||||
colordlg.h F
|
||||
colour.h F
|
||||
combobox.h F
|
||||
control.h F
|
||||
cursor.h F
|
||||
dataobj.h F
|
||||
dc.h F
|
||||
dcclient.h F
|
||||
dcmemory.h F
|
||||
dcprint.h F
|
||||
dcscreen.h F
|
||||
dialog.h F
|
||||
dnd.h F
|
||||
filedlg.h F
|
||||
font.h F
|
||||
fontdlg.h F
|
||||
frame.h F
|
||||
gauge.h F
|
||||
gdiobj.h F
|
||||
icon.h F
|
||||
joystick.h F
|
||||
listbox.h F
|
||||
mdi.h F
|
||||
menu.h F
|
||||
menuitem.h F
|
||||
metafile.h F
|
||||
minifram.h F
|
||||
msgdlg.h F
|
||||
palette.h F
|
||||
pen.h F
|
||||
print.h F
|
||||
printdlg.h F
|
||||
private.h F
|
||||
radiobox.h F
|
||||
radiobut.h F
|
||||
region.h F
|
||||
scrolbar.h F
|
||||
settings.h F
|
||||
slider.h F
|
||||
spinbutt.h F
|
||||
statbmp.h F
|
||||
statbox.h F
|
||||
stattext.h F
|
||||
textctrl.h F
|
||||
timer.h F
|
||||
toolbar.h F
|
||||
window.h F
|
||||
|
||||
execute.h S
|
||||
|
||||
file.h P
|
||||
|
||||
Loading…
Reference in New Issue
Block a user