Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fixes and typos corrected.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-07-29 13:43:08 +00:00
parent 631fd4122a
commit 9b61f868b5
13 changed files with 112 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
BuildCVS.txt
View File

@@ -45,15 +45,14 @@ and its make.exe).
-> type: cd c:\wxWin\src\msw -> type: cd c:\wxWin\src\msw
-> type: make -f makefile.g95 -> type: make -f makefile.g95
II) Unix using plain makefiles. II) GTK port on Unix using plain makefiles.
---------------------------------------- ------------------------------------------
Set WXWIN environment variable to the base directory such Set WXWIN environment variable to the base directory such
as ~/wxWindows as ~/wxWindows
-> type: export WXWIN=~/wxWindows -> type: export WXWIN=~/wxWindows
-> edit ~/wxWindows/src/gtk.env as you wish.
Edit ~/wxWindows/src/make.env as you wish.
-> type: cd ~/wxWindows/src/gtk -> type: cd ~/wxWindows/src/gtk
-> type: cp ./setup0.h setup.h -> type: cp ./setup0.h setup.h
-> type: make -> type: make

2
distrib/msw/tmake/gtk.t
View File

@@ -86,7 +86,7 @@ HTMLOBJS = \
GTKOBJS = \ GTKOBJS = \
#$ ExpandList("WXGTKOBJS"); #$ ExpandList("WXGTKOBJS");
UINXOBJS = \ UNIXOBJS = \
#$ ExpandList("WXUNIXOBJS"); #$ ExpandList("WXUNIXOBJS");
ZLIBOBJS = \ ZLIBOBJS = \

6
docs/gtk/changes.txt
View File

@@ -1,8 +1,10 @@
27th July '99: Eight wxGTK 2.1 snapshot released 29th July '99: Eight wxGTK 2.1 snapshot released
The new makefile system is not able to produce shared libraries The new makefile system is not able to produce shared libraries
on Unix with the exception of Linux - libtool is really great... on Unix with the exception of Linux - libtool is really great.
Therefore, the build system defaults to static libraries on
anything but Linux for now.
Work in wxPen, wxBrush and wxDC to match wxMSW more exactly and Work in wxPen, wxBrush and wxDC to match wxMSW more exactly and
to implement missing feature etc. to implement missing feature etc.

49
docs/gtk/install.txt
View File

@@ -9,39 +9,44 @@
If you compile wxWindows on Linux for the first time and don't like to read If you compile wxWindows on Linux for the first time and don't like to read
install instructions just do (in the base dir): install instructions just do (in the base dir):
./configure > ./configure --with-gtk
make > make
su <type root password> > su <type root password>
make install > make install
ldconfig > ldconfig
exit > exit
On all other Unices (maybe except *BSD), shared libraries are not supported On all variants of Unix except Linux (and maybe except *BSD), shared libraries
out of the box due to the utter stupidity of libtool, so you'll have to do are not supportet out of the box due to the utter stupidity of libtool, so you'll
this instead: have to do this to get shared library support:
./configure --enable-static --disable-shared > ./configure --with-gtk --disable-static --enable-shared
make
su <type root password> Then you'll have to edit the wrongly created libtool script. There are two
make install important entries with respect to shared library creation, which are
ldconfig
exit
You may also want to try to edit the wrongly created libtool script
in your build directory, if you need shared libraries on Unix. The
wrong entries are something like
archive_cmds="\$LD -shared .... archive_cmds="\$LD -shared ....
archive_expsym_cmds="\$LD -shared .... archive_expsym_cmds="\$LD -shared ....
which should be something like which should be something like
archive_cmds="\$CC -shared .... archive_cmds="\$CC -shared ....
archive_expsym_cmds="\$CC -shared .... archive_expsym_cmds="\$CC -shared ....
Afterwards you can continue with
> make
> su <type root password>
> make install
> ldconfig
> exit
If you want to remove wxWindows on Unix you can do this: If you want to remove wxWindows on Unix you can do this:
su <type root password> > su <type root password>
make uninstall > make uninstall
ldconfig > ldconfig
exit > exit
* The expert case * The expert case
----------------- -----------------

51
docs/motif2/install.txt
View File

@@ -6,42 +6,47 @@
* The most simple case * The most simple case
----------------------- -----------------------
If you compile wxWindows on Unix for the first time and don't like to read If you compile wxWindows on Linux for the first time and don't like to read
install instructions just do (in the base dir): install instructions just do (in the base dir):
./configure --with-motif > ./configure --with-motif
make > make
su <type root password> > su <type root password>
make install > make install
ldconfig > ldconfig
exit > exit
On all other Unices (maybe except *BSD), shared libraries are not supported On all variants of Unix except Linux (and maybe except *BSD), shared libraries
out of the box due to the utter stupidity of libtool, so you'll have to do are not supportet out of the box due to the utter stupidity of libtool, so you'll
this instead: have to do this to get shared library support:
./configure --enable-static --disable-shared > ./configure --with-motif --disable-static --enable-shared
make
su <type root password> Then you'll have to edit the wrongly created libtool script. There are two
make install important entries with respect to shared library creation, which are
ldconfig
exit
You may also want to try to edit the wrongly created libtool script
in your build directory, if you need shared libraries on Unix. The
wrong entries are something like
archive_cmds="\$LD -shared .... archive_cmds="\$LD -shared ....
archive_expsym_cmds="\$LD -shared .... archive_expsym_cmds="\$LD -shared ....
which should be something like which should be something like
archive_cmds="\$CC -shared .... archive_cmds="\$CC -shared ....
archive_expsym_cmds="\$CC -shared .... archive_expsym_cmds="\$CC -shared ....
Afterwards you can continue with
> make
> su <type root password>
> make install
> ldconfig
> exit
If you want to remove wxWindows on Unix you can do this: If you want to remove wxWindows on Unix you can do this:
su <type root password> > su <type root password>
make uninstall > make uninstall
ldconfig > ldconfig
exit > exit
* The expert case * The expert case
----------------- -----------------

47
docs/wine/install.txt
View File

@@ -28,22 +28,47 @@ change disables the Windows native calling convention.
* The most simple case * The most simple case
----------------------- -----------------------
If you compile wxWindows on Unix for the first time and don't like to read If you compile wxWindows on Linux for the first time and don't like to read
install instructions just do (in the base dir): install instructions just do (in the base dir):
./configure --with-wine > ./configure --with-wine
make > make
su <type root password> > su <type root password>
make install > make install
ldconfig > ldconfig
exit > exit
On all variants of Unix except Linux (and maybe except *BSD), shared libraries
are not supportet out of the box due to the utter stupidity of libtool, so you'll
have to do this to get shared library support:
> ./configure --with-wine --disable-static --enable-shared
Then you'll have to edit the wrongly created libtool script. There are two
important entries with respect to shared library creation, which are
archive_cmds="\$LD -shared ....
archive_expsym_cmds="\$LD -shared ....
which should be something like
archive_cmds="\$CC -shared ....
archive_expsym_cmds="\$CC -shared ....
Afterwards you can continue with
> make
> su <type root password>
> make install
> ldconfig
> exit
If you want to remove wxWindows on Unix you can do this: If you want to remove wxWindows on Unix you can do this:
su <type root password> > su <type root password>
make uninstall > make uninstall
ldconfig > ldconfig
exit > exit
* The expert case * The expert case
----------------- -----------------

2
include/wx/gtk/setup0.h
View File

@@ -343,7 +343,7 @@
* Use standard C++ streams if 1. If 0, use wxWin * Use standard C++ streams if 1. If 0, use wxWin
* streams implementation. * streams implementation.
*/ */
#define wxUSE_STD_IOSTREAM 1 #define wxUSE_STD_IOSTREAM 0
/* /*
* wxLibrary class * wxLibrary class
*/ */

2
include/wx/gtk1/setup0.h
View File

@@ -343,7 +343,7 @@
* Use standard C++ streams if 1. If 0, use wxWin * Use standard C++ streams if 1. If 0, use wxWin
* streams implementation. * streams implementation.
*/ */
#define wxUSE_STD_IOSTREAM 1 #define wxUSE_STD_IOSTREAM 0
/* /*
* wxLibrary class * wxLibrary class
*/ */

2
src/generic/progdlgg.cpp
View File

@@ -41,7 +41,7 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
# include "wx/timer.h" #include "wx/timer.h"
#endif #endif
#include "wx/generic/progdlgg.h" #include "wx/generic/progdlgg.h"

10
src/gtk.env
View File

@@ -19,6 +19,8 @@ MAX_VER = 2
MIN_VER = 1 MIN_VER = 1
MIC_VER = 0 MIC_VER = 0
WXLIB =
########################### Programs ################################# ########################### Programs #################################
# C++ compiler # C++ compiler
@@ -77,7 +79,9 @@ EXTRA_INC = -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXD
############################ Libraries ################################ ############################ Libraries ################################
LD_LIBS = -L$(WXDIR)/lib -llibwx_$(GUI).a `gtk-config --libs` -L/usr/lib -ldl WXLIB = $(WXDIR)/lib/libwx_$(GUI).a
LD_LIBS = $(WXLIB) `gtk-config --libs` -L/usr/lib -ldl -lpthread
############################# Suffixes ################################ ############################# Suffixes ################################
@@ -85,8 +89,8 @@ OBJSUFF = o
####################### No changes below this line #################### ####################### No changes below this line ####################
CPPFLAGS = $(GUI_OPT) $(CPP_EXTRA) $(CPP_OPT) $(CPP_DEBUG) $(CPP_WARN) $(WX_INC) $(EXTRA_INCLUDE) $(GUI_INC) CPPFLAGS = $(GUI_OPT) $(CPP_EXTRA) $(CPP_OPT) $(CPP_DEBUG) $(CPP_WARN) $(WX_INC) $(EXTRA_INC) $(GUI_INC)
CFLAGS = $(GUI_OPT) $(C_EXTRA) $(C_OPT) $(C_DEBUG) $(C_WARN) $(WX_INC) $(EXTRA_INCLUDE) $(GUI_INC) CFLAGS = $(GUI_OPT) $(C_EXTRA) $(C_OPT) $(C_DEBUG) $(C_WARN) $(WX_INC) $(EXTRA_INC) $(GUI_INC)
LDFLAGS = $(LD_EXTRA) $(LD_LIBS) LDFLAGS = $(LD_EXTRA) $(LD_LIBS)
# Clears all default suffixes # Clears all default suffixes

2
src/gtk/Makefile
View File

@@ -216,7 +216,7 @@ GTKOBJS = \
$(GTKDIR)/win_gtk.$(OBJSUFF) \ $(GTKDIR)/win_gtk.$(OBJSUFF) \
$(GTKDIR)/window.$(OBJSUFF) $(GTKDIR)/window.$(OBJSUFF)
UINXOBJS = \ UNIXOBJS = \
$(UNIXDIR)/gsocket.$(OBJSUFF) \ $(UNIXDIR)/gsocket.$(OBJSUFF) \
$(UNIXDIR)/threadpsx.$(OBJSUFF) \ $(UNIXDIR)/threadpsx.$(OBJSUFF) \
$(UNIXDIR)/utilsunx.$(OBJSUFF) $(UNIXDIR)/utilsunx.$(OBJSUFF)

2
src/gtk1/Makefile
View File

@@ -216,7 +216,7 @@ GTKOBJS = \
$(GTKDIR)/win_gtk.$(OBJSUFF) \ $(GTKDIR)/win_gtk.$(OBJSUFF) \
$(GTKDIR)/window.$(OBJSUFF) $(GTKDIR)/window.$(OBJSUFF)
UINXOBJS = \ UNIXOBJS = \
$(UNIXDIR)/gsocket.$(OBJSUFF) \ $(UNIXDIR)/gsocket.$(OBJSUFF) \
$(UNIXDIR)/threadpsx.$(OBJSUFF) \ $(UNIXDIR)/threadpsx.$(OBJSUFF) \
$(UNIXDIR)/utilsunx.$(OBJSUFF) $(UNIXDIR)/utilsunx.$(OBJSUFF)

1
src/unix/gsocket.c
View File

@@ -28,6 +28,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h>
#ifdef sun #ifdef sun
# include <sys/filio.h> # include <sys/filio.h>