From 9b61f868b597a84fd3c589b2e8539624c491f86b Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 29 Jul 1999 13:43:08 +0000 Subject: [PATCH] Compile fixes and typos corrected. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- BuildCVS.txt | 7 +++--- distrib/msw/tmake/gtk.t | 2 +- docs/gtk/changes.txt | 6 +++-- docs/gtk/install.txt | 49 +++++++++++++++++++++----------------- docs/motif2/install.txt | 51 ++++++++++++++++++++++------------------ docs/wine/install.txt | 47 +++++++++++++++++++++++++++--------- include/wx/gtk/setup0.h | 2 +- include/wx/gtk1/setup0.h | 2 +- src/generic/progdlgg.cpp | 2 +- src/gtk.env | 10 +++++--- src/gtk/Makefile | 2 +- src/gtk1/Makefile | 2 +- src/unix/gsocket.c | 1 + 13 files changed, 112 insertions(+), 71 deletions(-) diff --git a/BuildCVS.txt b/BuildCVS.txt index e5a6bb4f8d..420989f63d 100644 --- a/BuildCVS.txt +++ b/BuildCVS.txt @@ -45,15 +45,14 @@ and its make.exe). -> type: cd c:\wxWin\src\msw -> 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 as ~/wxWindows -> type: export WXWIN=~/wxWindows - -Edit ~/wxWindows/src/make.env as you wish. +-> edit ~/wxWindows/src/gtk.env as you wish. -> type: cd ~/wxWindows/src/gtk -> type: cp ./setup0.h setup.h -> type: make diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t index 7049dc4583..5dfb5e2d75 100644 --- a/distrib/msw/tmake/gtk.t +++ b/distrib/msw/tmake/gtk.t @@ -86,7 +86,7 @@ HTMLOBJS = \ GTKOBJS = \ #$ ExpandList("WXGTKOBJS"); -UINXOBJS = \ +UNIXOBJS = \ #$ ExpandList("WXUNIXOBJS"); ZLIBOBJS = \ diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt index 7be7e77d72..770dd42ef1 100644 --- a/docs/gtk/changes.txt +++ b/docs/gtk/changes.txt @@ -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 -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 to implement missing feature etc. diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index 091e743a96..5cc34a7f41 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -9,39 +9,44 @@ If you compile wxWindows on Linux for the first time and don't like to read install instructions just do (in the base dir): -./configure -make -su -make install -ldconfig -exit +> ./configure --with-gtk +> make +> su +> make install +> ldconfig +> exit -On all other Unices (maybe except *BSD), shared libraries are not supported -out of the box due to the utter stupidity of libtool, so you'll have to do -this instead: +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 --enable-static --disable-shared -make -su -make install -ldconfig -exit +> ./configure --with-gtk --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 -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_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 +> make install +> ldconfig +> exit If you want to remove wxWindows on Unix you can do this: -su -make uninstall -ldconfig -exit +> su +> make uninstall +> ldconfig +> exit * The expert case ----------------- diff --git a/docs/motif2/install.txt b/docs/motif2/install.txt index ecd1befffd..02f22033ff 100644 --- a/docs/motif2/install.txt +++ b/docs/motif2/install.txt @@ -6,42 +6,47 @@ * 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): -./configure --with-motif -make -su -make install -ldconfig -exit +> ./configure --with-motif +> make +> su +> make install +> ldconfig +> exit -On all other Unices (maybe except *BSD), shared libraries are not supported -out of the box due to the utter stupidity of libtool, so you'll have to do -this instead: +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 --enable-static --disable-shared -make -su -make install -ldconfig -exit +> ./configure --with-motif --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 -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_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 +> make install +> ldconfig +> exit If you want to remove wxWindows on Unix you can do this: -su -make uninstall -ldconfig -exit +> su +> make uninstall +> ldconfig +> exit * The expert case ----------------- diff --git a/docs/wine/install.txt b/docs/wine/install.txt index 8663d9b939..ab0afa3fd7 100644 --- a/docs/wine/install.txt +++ b/docs/wine/install.txt @@ -28,22 +28,47 @@ change disables the Windows native calling convention. * 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): -./configure --with-wine -make -su -make install -ldconfig -exit +> ./configure --with-wine +> make +> su +> make install +> ldconfig +> 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 +> make install +> ldconfig +> exit If you want to remove wxWindows on Unix you can do this: -su -make uninstall -ldconfig -exit +> su +> make uninstall +> ldconfig +> exit * The expert case ----------------- diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index 0d805c5948..56309bccfa 100644 --- a/include/wx/gtk/setup0.h +++ b/include/wx/gtk/setup0.h @@ -343,7 +343,7 @@ * Use standard C++ streams if 1. If 0, use wxWin * streams implementation. */ -#define wxUSE_STD_IOSTREAM 1 +#define wxUSE_STD_IOSTREAM 0 /* * wxLibrary class */ diff --git a/include/wx/gtk1/setup0.h b/include/wx/gtk1/setup0.h index 0d805c5948..56309bccfa 100644 --- a/include/wx/gtk1/setup0.h +++ b/include/wx/gtk1/setup0.h @@ -343,7 +343,7 @@ * Use standard C++ streams if 1. If 0, use wxWin * streams implementation. */ -#define wxUSE_STD_IOSTREAM 1 +#define wxUSE_STD_IOSTREAM 0 /* * wxLibrary class */ diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index d7ef8b88e6..adde5d7978 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -41,7 +41,7 @@ #include "wx/intl.h" #include "wx/settings.h" #include "wx/dcclient.h" -# include "wx/timer.h" + #include "wx/timer.h" #endif #include "wx/generic/progdlgg.h" diff --git a/src/gtk.env b/src/gtk.env index 85a2b80b6a..18090c1721 100644 --- a/src/gtk.env +++ b/src/gtk.env @@ -19,6 +19,8 @@ MAX_VER = 2 MIN_VER = 1 MIC_VER = 0 +WXLIB = + ########################### Programs ################################# # C++ compiler @@ -77,7 +79,9 @@ EXTRA_INC = -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXD ############################ 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 ################################ @@ -85,8 +89,8 @@ OBJSUFF = o ####################### No changes below this line #################### -CPPFLAGS = $(GUI_OPT) $(CPP_EXTRA) $(CPP_OPT) $(CPP_DEBUG) $(CPP_WARN) $(WX_INC) $(EXTRA_INCLUDE) $(GUI_INC) -CFLAGS = $(GUI_OPT) $(C_EXTRA) $(C_OPT) $(C_DEBUG) $(C_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_INC) $(GUI_INC) LDFLAGS = $(LD_EXTRA) $(LD_LIBS) # Clears all default suffixes diff --git a/src/gtk/Makefile b/src/gtk/Makefile index 5510837def..5d23867ff3 100644 --- a/src/gtk/Makefile +++ b/src/gtk/Makefile @@ -216,7 +216,7 @@ GTKOBJS = \ $(GTKDIR)/win_gtk.$(OBJSUFF) \ $(GTKDIR)/window.$(OBJSUFF) -UINXOBJS = \ +UNIXOBJS = \ $(UNIXDIR)/gsocket.$(OBJSUFF) \ $(UNIXDIR)/threadpsx.$(OBJSUFF) \ $(UNIXDIR)/utilsunx.$(OBJSUFF) diff --git a/src/gtk1/Makefile b/src/gtk1/Makefile index 5510837def..5d23867ff3 100644 --- a/src/gtk1/Makefile +++ b/src/gtk1/Makefile @@ -216,7 +216,7 @@ GTKOBJS = \ $(GTKDIR)/win_gtk.$(OBJSUFF) \ $(GTKDIR)/window.$(OBJSUFF) -UINXOBJS = \ +UNIXOBJS = \ $(UNIXDIR)/gsocket.$(OBJSUFF) \ $(UNIXDIR)/threadpsx.$(OBJSUFF) \ $(UNIXDIR)/utilsunx.$(OBJSUFF) diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c index 1e6e0254fe..ef6f652c77 100644 --- a/src/unix/gsocket.c +++ b/src/unix/gsocket.c @@ -28,6 +28,7 @@ #include #include #include +#include #ifdef sun # include -- 2.45.2