From 631fd4122ac6d19b5785345d25eb70d54bbdb523 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 29 Jul 1999 12:51:29 +0000 Subject: [PATCH] Makefile changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- BuildCVS.txt | 4 +- configure.in | 48 +++- distrib/msw/tmake/{gtk_gnu.t => gtk.t} | 69 +----- distrib/msw/tmake/makeall.bat | 2 + include/wx/gtk/setup0.h | 53 ++++- include/wx/gtk1/setup0.h | 53 ++++- src/gtk.env | 103 +++++++++ src/gtk/{makefile.gnu => Makefile} | 57 +---- src/gtk/makefile.unx | 296 ------------------------- src/gtk1/{makefile.gnu => Makefile} | 57 +---- src/gtk1/makefile.unx | 296 ------------------------- src/makelib.gtk | 21 ++ src/makeprog.gtk | 13 ++ 13 files changed, 279 insertions(+), 793 deletions(-) rename distrib/msw/tmake/{gtk_gnu.t => gtk.t} (80%) create mode 100644 src/gtk.env rename src/gtk/{makefile.gnu => Makefile} (89%) delete mode 100644 src/gtk/makefile.unx rename src/gtk1/{makefile.gnu => Makefile} (89%) delete mode 100644 src/gtk1/makefile.unx create mode 100644 src/makelib.gtk create mode 100644 src/makeprog.gtk diff --git a/BuildCVS.txt b/BuildCVS.txt index 71ee27375c..e5a6bb4f8d 100644 --- a/BuildCVS.txt +++ b/BuildCVS.txt @@ -56,8 +56,8 @@ as ~/wxWindows Edit ~/wxWindows/src/make.env as you wish. -> type: cd ~/wxWindows/src/gtk -> type: cp ./setup0.h setup.h --> type: make -f makefile.unx gtk --> pray +-> type: make + III) Windows using configure ---------------------------------------- diff --git a/configure.in b/configure.in index 5a99554399..cf00865f5c 100644 --- a/configure.in +++ b/configure.in @@ -888,7 +888,53 @@ dnl DLLs under Win32. dnl AC_LIBTOOL_WIN32_DLL dnl disable static libs by default, this takes too much time... -AM_DISABLE_STATIC +dnl libtool doesn't work on anything but Linux and maybe +dnl ***BSD + +case "${host}" in + *-hp-hpux* ) + AM_DISABLE_SHARED + ;; + *-*-linux* ) + AM_DISABLE_STATIC + ;; + *-*-irix5* | *-*-irix6* ) + AM_DISABLE_SHARED + ;; + *-*-solaris2* ) + AM_DISABLE_SHARED + ;; + *-*-sunos4* ) + AM_DISABLE_SHARED + ;; + *-*-freebsd* | *-*-netbsd*) + AM_DISABLE_STATIC + ;; + *-*-osf* ) + AM_DISABLE_SHARED + ;; + *-*-dgux5* ) + AM_DISABLE_SHARED + ;; + *-*-sysv5* ) + AM_DISABLE_SHARED + ;; + *-*-aix* ) + AM_DISABLE_SHARED + ;; + *-*-cygwin32* ) + AM_DISABLE_STATIC + ;; + *-*-mingw32* ) + AM_DISABLE_STATIC + ;; + *-pc-os2_emx ) + AM_DISABLE_SHARED + ;; + *) + AC_MSG_ERROR(unknown system type ${host}.) +esac + AM_PROG_LIBTOOL dnl --------------------------------------------------------------------------- diff --git a/distrib/msw/tmake/gtk_gnu.t b/distrib/msw/tmake/gtk.t similarity index 80% rename from distrib/msw/tmake/gtk_gnu.t rename to distrib/msw/tmake/gtk.t index c05efc55a1..7049dc4583 100644 --- a/distrib/msw/tmake/gtk_gnu.t +++ b/distrib/msw/tmake/gtk.t @@ -1,7 +1,7 @@ #!############################################################################# -#! File: gtk_gnu.t -#! Purpose: tmake template file from which makefile.gnu is generated by running -#! tmake -t gtk_gnu wxwin.pro -o makefile.gnu +#! File: gtk.t +#! Purpose: tmake template file from which Makefile is generated by running +#! tmake -t gtk wxwin.pro -o Makefile #! Author: Vadim Zeitlin, Robert Roebling, Julian Smart #! Created: 14.07.99 #! Version: $Id$ @@ -9,7 +9,7 @@ #${ #! include the code which parses filelist.txt file and initializes - #! %wxCommon, %wxGeneric, %wxHtml, wxUnix and %wxGTK hashes. + #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix and %wxGTK hashes. IncludeTemplate("filelist.t"); #! now transform these hashes into $project tags @@ -43,10 +43,10 @@ } #$} # This file was automatically generated by tmake at #$ Now() -# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GNU.T! +# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! # -# File: makefile.gnu +# File: Makefile # Author: Julian Smart, Robert Roebling, Vadim Zeitlin # Created: 1993 # Updated: 1999 @@ -56,64 +56,9 @@ # # Makefile for libwx_gtk.a -# GUI -GUI = gtk - -# Replace this with your own path if necessary WXDIR = ../.. -# C++ compiler -CC = gcc - -# C compiler -CCC = gcc - -# Compiler for lex/yacc .c programs -CCLEX = $(CCC) - -LEX = lex -YACC = yacc -# Note: if using bison, use -y option for yacc compatibility -# YACC = bison -y -MAKE = make -AROPTIONS = ruv -RANLIB = ranlib - -# Debug/trace mode. 1 or more for debugging. -DEBUG = 1 - -# Misc options -CPPOPTIONS = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT -fno-rtti -fno-exceptions -COPTIONS = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT -CPPWARN = -Wall -CWARN = -OPTIMISE = -O2 -fno-strength-reduce - -# object file suffix -OBJSUFF =o - -# no changes below this line - -GUIINCLUDES = `gtk-config --cflags` - -WXINC = -I$(WXDIR)/include -WXLIB = $(WXDIR)/lib/libwx_$(GUI).a -INCLUDES = $(WXINC) $(GUIINCLUDES) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib - -CPPFLAGS = $(INCLUDES) $(CPPOPTIONS) $(CPPWARN) $(OPTIMISE) -CFLAGS = $(INCLUDES) $(COPTIONS) $(CWARN) $(OPTIMISE) - -# Clears all default suffixes -.SUFFIXES: .o .cpp .c - -.c.o : - $(CCC) -c $(CFLAGS) -o $@ $< - -.cpp.o : - $(CC) -c $(CPPFLAGS) -o $@ $< - -.C.o : - $(CC) -c $(CPPFLAGS) -o $@ $< +include $(WXDIR)/src/gtk.env # Subordinate library possibilities diff --git a/distrib/msw/tmake/makeall.bat b/distrib/msw/tmake/makeall.bat index f96aed1eb2..4ac471f56c 100755 --- a/distrib/msw/tmake/makeall.bat +++ b/distrib/msw/tmake/makeall.bat @@ -49,5 +49,7 @@ echo Generating for Symantec C++... E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t sc wxwin.pro -o makefile.sc echo Generating for Watcom C++... E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t wat wxwin.pro -o makefile.wat +echo Generating for wxGTK... +E:\Perl\5.00471\bin\MSWin32-x86\perl.exe g:\Unix\tmake\bin\tmake -t gtk wxwin.pro -o Makefile :end diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index 812b3e1168..0d805c5948 100644 --- a/include/wx/gtk/setup0.h +++ b/include/wx/gtk/setup0.h @@ -4,8 +4,10 @@ /* */ /* Version: $Id$ */ -#ifndef __GTKSETUPH__ -#define __GTKSETUPH__ +/* This define (__WX_SETUP_H__) is used both to insure setup.h is included + * only once and to indicate that we are building using configure. */ +#ifndef __WX_SETUP_H__ +#define __WX_SETUP_H__ #ifdef __GNUG__ #pragma interface @@ -85,6 +87,7 @@ /* #undef __WIN95__ */ /* #undef __WIN32__ */ /* #undef __GNUWIN32__ */ +/* #undef WINVER */ /* * Supports bool type @@ -280,7 +283,7 @@ */ #define wxUSE_TOOLBAR 1 -#ifdef __WXWINE__ +#if defined(__WXWINE__) || defined(__GNUWIN32__) #if wxUSE_TOOLBAR #define wxUSE_BUTTONBAR 1 #endif @@ -340,7 +343,7 @@ * Use standard C++ streams if 1. If 0, use wxWin * streams implementation. */ -#define wxUSE_STD_IOSTREAM 0 +#define wxUSE_STD_IOSTREAM 1 /* * wxLibrary class */ @@ -455,21 +458,21 @@ * Use Apple Ieee-double converter */ #define wxUSE_APPLE_IEEE 1 -/* +/* * Compatibility with 1.66 API. * Level 0: no backward compatibility, all new features * Level 1: wxDC, OnSize (etc.) compatibility, but - * some new features such as event tables + * some new features such as event tables */ #define WXWIN_COMPATIBILITY 0 -/* - * Compatibility with 2.0 API. +/* + * Compatibility with 2.0 API. */ #define WXWIN_COMPATIBILITY_2 1 /* * Enables debugging: memory tracing, assert, etc., contains debug level */ -#define WXDEBUG 0 +#define WXDEBUG 1 /* * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG) * WARNING: this code may not work with all architectures, especially @@ -514,6 +517,29 @@ */ #define wxUSE_MINIFRAME 1 +/* + * wxHTML + */ +#define wxUSE_HTML 1 + +/* + * (virtual) filesystems code + */ +#define wxUSE_FS_INET 1 +#define wxUSE_FS_ZIP 1 + +/* + * A class that shows info window when app is busy + * (works exactly like wxBusyCursor) + */ +#define wxUSE_BUSYINFO 1 + +/* + * Zip stream for accessing files stored inside .zip archives + */ +#define wxUSE_ZIPSTREAM 1 + + /* * Disable this if your compiler can't cope * with omission of prototype parameters. @@ -524,9 +550,9 @@ * You can use this setting to maintain backward compatibility. * If 0: will use const wherever possible. * If 1: will use const only where necessary - * for precompiled headers to work. + * for precompiled headers to work. * If 2: will be totally backward compatible, but precompiled - * headers may not work and program size will be larger. + * headers may not work and program size will be larger. */ #define CONST_COMPATIBILITY 0 @@ -605,6 +631,9 @@ /* Define if you have the vsnprintf function. */ #define HAVE_VSNPRINTF 1 +/* Define if you have the vsscanf function. */ +#define HAVE_VSSCANF 1 + /* Define if you have the header file. */ #define HAVE_X11_XKBLIB_H 1 @@ -639,4 +668,4 @@ #define VERSION "2.1.0" -#endif /* __GTKSETUPH__ */ +#endif /* __WX_SETUP_H__ */ diff --git a/include/wx/gtk1/setup0.h b/include/wx/gtk1/setup0.h index 812b3e1168..0d805c5948 100644 --- a/include/wx/gtk1/setup0.h +++ b/include/wx/gtk1/setup0.h @@ -4,8 +4,10 @@ /* */ /* Version: $Id$ */ -#ifndef __GTKSETUPH__ -#define __GTKSETUPH__ +/* This define (__WX_SETUP_H__) is used both to insure setup.h is included + * only once and to indicate that we are building using configure. */ +#ifndef __WX_SETUP_H__ +#define __WX_SETUP_H__ #ifdef __GNUG__ #pragma interface @@ -85,6 +87,7 @@ /* #undef __WIN95__ */ /* #undef __WIN32__ */ /* #undef __GNUWIN32__ */ +/* #undef WINVER */ /* * Supports bool type @@ -280,7 +283,7 @@ */ #define wxUSE_TOOLBAR 1 -#ifdef __WXWINE__ +#if defined(__WXWINE__) || defined(__GNUWIN32__) #if wxUSE_TOOLBAR #define wxUSE_BUTTONBAR 1 #endif @@ -340,7 +343,7 @@ * Use standard C++ streams if 1. If 0, use wxWin * streams implementation. */ -#define wxUSE_STD_IOSTREAM 0 +#define wxUSE_STD_IOSTREAM 1 /* * wxLibrary class */ @@ -455,21 +458,21 @@ * Use Apple Ieee-double converter */ #define wxUSE_APPLE_IEEE 1 -/* +/* * Compatibility with 1.66 API. * Level 0: no backward compatibility, all new features * Level 1: wxDC, OnSize (etc.) compatibility, but - * some new features such as event tables + * some new features such as event tables */ #define WXWIN_COMPATIBILITY 0 -/* - * Compatibility with 2.0 API. +/* + * Compatibility with 2.0 API. */ #define WXWIN_COMPATIBILITY_2 1 /* * Enables debugging: memory tracing, assert, etc., contains debug level */ -#define WXDEBUG 0 +#define WXDEBUG 1 /* * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG) * WARNING: this code may not work with all architectures, especially @@ -514,6 +517,29 @@ */ #define wxUSE_MINIFRAME 1 +/* + * wxHTML + */ +#define wxUSE_HTML 1 + +/* + * (virtual) filesystems code + */ +#define wxUSE_FS_INET 1 +#define wxUSE_FS_ZIP 1 + +/* + * A class that shows info window when app is busy + * (works exactly like wxBusyCursor) + */ +#define wxUSE_BUSYINFO 1 + +/* + * Zip stream for accessing files stored inside .zip archives + */ +#define wxUSE_ZIPSTREAM 1 + + /* * Disable this if your compiler can't cope * with omission of prototype parameters. @@ -524,9 +550,9 @@ * You can use this setting to maintain backward compatibility. * If 0: will use const wherever possible. * If 1: will use const only where necessary - * for precompiled headers to work. + * for precompiled headers to work. * If 2: will be totally backward compatible, but precompiled - * headers may not work and program size will be larger. + * headers may not work and program size will be larger. */ #define CONST_COMPATIBILITY 0 @@ -605,6 +631,9 @@ /* Define if you have the vsnprintf function. */ #define HAVE_VSNPRINTF 1 +/* Define if you have the vsscanf function. */ +#define HAVE_VSSCANF 1 + /* Define if you have the header file. */ #define HAVE_X11_XKBLIB_H 1 @@ -639,4 +668,4 @@ #define VERSION "2.1.0" -#endif /* __GTKSETUPH__ */ +#endif /* __WX_SETUP_H__ */ diff --git a/src/gtk.env b/src/gtk.env new file mode 100644 index 0000000000..85a2b80b6a --- /dev/null +++ b/src/gtk.env @@ -0,0 +1,103 @@ +# gtk.env +# +# Common makefile settings for wxGTK programs. You have to set +# the WXDIR variable before including this file. +# +# This file is included by all the other makefiles, thus changes +# made here take effect everywhere (except where overriden). +# +# RCS-ID: $Id$ +# + +########################### General ################################# + +# The name of the GUI used in directory paths and library names +GUI = gtk + +# The library version number +MAX_VER = 2 +MIN_VER = 1 +MIC_VER = 0 + +########################### Programs ################################# + +# C++ compiler +CC = gcc + +# C compiler +CCC = gcc + +# Compiler for lex/yacc .c programs +CCLEX = $(CCC) + +LEX = lex +YACC = yacc +# Note: if using bison, use -y option for yacc compatibility +# YACC = bison -y +MAKE = make +AROPTIONS = ruv +RANLIB = ranlib + +############################ Switches ################################# + +# Debug/trace mode. 1 or more for debugging. +DEBUG = 1 +GUI_OPT = -D__WXGTK__ -D__UNIX__ + +########################## Compiler flags ############################# + +# Misc options +CPP_EXTRA = -D_REENTRANT +C_EXTRA = -D_REENTRANT +LEX_EXTRA = -D_REENTRANT + +# Optimisation +CPP_OPT = -O2 -fno-strength-reduce -DGTK_NO_CHECK_CASTS -fno-rtti -fno-exceptions +C_OPT = -O2 -fno-strength-reduce -DGTK_NO_CHECK_CASTS +LEX_OPT = -O2 -fno-strength-reduce + +# Debug +CPP_DEBUG = -D__WXDEBUG__ # -g +C_DEBUG = -D__WXDEBUG__ +LEX_DEBUG = -D__WXDEBUG__ + +# Warning level +CPP_WARN = -Wall +C_WARN = -Wall -Wno-unused +LEX_WARN = -Wall + +# Link flag +LD_EXTRA = + +############################ Includes ################################# + +WX_INC = -I$(WXDIR)/include +GUI_INC = `gtk-config --cflags` +EXTRA_INC = -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/odbc + +############################ Libraries ################################ + +LD_LIBS = -L$(WXDIR)/lib -llibwx_$(GUI).a `gtk-config --libs` -L/usr/lib -ldl + +############################# Suffixes ################################ + +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) +LDFLAGS = $(LD_EXTRA) $(LD_LIBS) + +# Clears all default suffixes +.SUFFIXES: .o .cpp .c + +.c.o : + $(CCC) -c $(CFLAGS) -o $@ $< + +.cpp.o : + $(CC) -c $(CPPFLAGS) -o $@ $< + +.C.o : + $(CC) -c $(CPPFLAGS) -o $@ $< + diff --git a/src/gtk/makefile.gnu b/src/gtk/Makefile similarity index 89% rename from src/gtk/makefile.gnu rename to src/gtk/Makefile index a5a84ef35f..5510837def 100644 --- a/src/gtk/makefile.gnu +++ b/src/gtk/Makefile @@ -13,64 +13,9 @@ # # Makefile for libwx_gtk.a -# GUI -GUI = gtk - -# Replace this with your own path if necessary WXDIR = ../.. -# C++ compiler -CC = gcc - -# C compiler -CCC = gcc - -# Compiler for lex/yacc .c programs -CCLEX = $(CCC) - -LEX = lex -YACC = yacc -# Note: if using bison, use -y option for yacc compatibility -# YACC = bison -y -MAKE = make -AROPTIONS = ruv -RANLIB = ranlib - -# Debug/trace mode. 1 or more for debugging. -DEBUG = 1 - -# Misc options -CPPOPTIONS = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT -fno-rtti -fno-exceptions -COPTIONS = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT -CPPWARN = -Wall -CWARN = -OPTIMISE = -O2 -fno-strength-reduce - -# object file suffix -OBJSUFF =o - -# no changes below this line - -GUIINCLUDES = `gtk-config --cflags` - -WXINC = -I$(WXDIR)/include -WXLIB = $(WXDIR)/lib/libwx_$(GUI).a -INCLUDES = $(WXINC) $(GUIINCLUDES) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib - -CPPFLAGS = $(INCLUDES) $(CPPOPTIONS) $(CPPWARN) $(OPTIMISE) -CFLAGS = $(INCLUDES) $(COPTIONS) $(CWARN) $(OPTIMISE) - -# Clears all default suffixes -.SUFFIXES: .o .cpp .c - -.c.o : - $(CCC) -c $(CFLAGS) -o $@ $< - -.cpp.o : - $(CC) -c $(CPPFLAGS) -o $@ $< - -.C.o : - $(CC) -c $(CPPFLAGS) -o $@ $< +include $(WXDIR)/src/gtk.env # Subordinate library possibilities diff --git a/src/gtk/makefile.unx b/src/gtk/makefile.unx deleted file mode 100644 index 6d91815fb9..0000000000 --- a/src/gtk/makefile.unx +++ /dev/null @@ -1,296 +0,0 @@ -# -# File: makefile.unx -# Author: Robert Roebling -# Created: 1998 -# Updated: -# Copyright: (c) 1998, 1999 -# -# -# Makefile for wxWindows library, GTK 1.2, Unix -# - -EXTRACFLAGS=-DLEX_SCANNER - -include ../make.env - -LIB_CPP_SRC=\ -\ - accel.cpp \ - app.cpp \ - bitmap.cpp \ - bmpbuttn.cpp \ - brush.cpp \ - button.cpp \ - checkbox.cpp \ - checklst.cpp \ - choice.cpp \ - choicdlg.cpp \ - clipbrd.cpp \ - colour.cpp \ - combobox.cpp \ - control.cpp \ - cursor.cpp \ - data.cpp \ - dataobj.cpp \ - dc.cpp \ - dcclient.cpp \ - dcmemory.cpp \ - dcscreen.cpp \ - dialog.cpp \ - dnd.cpp \ - filedlg.cpp \ - font.cpp \ - frame.cpp \ - gauge.cpp \ - gdiobj.cpp \ - icon.cpp \ - listbox.cpp \ - main.cpp \ - mdi.cpp \ - menu.cpp \ - minifram.cpp \ - msgdlg.cpp \ - notebook.cpp \ - palette.cpp \ - pen.cpp \ - radiobox.cpp \ - radiobut.cpp \ - region.cpp \ - scrolbar.cpp \ - settings.cpp \ - slider.cpp \ - spinbutt.cpp \ - statbmp.cpp \ - statbox.cpp \ - statline.cpp \ - stattext.cpp \ - tbargtk.cpp \ - textctrl.cpp \ - textdlg.cpp \ - timer.cpp \ - tooltip.cpp \ - utilsgtk.cpp \ - utilsres.cpp \ - wave.cpp \ - window.cpp \ -\ - ../common/cmndata.cpp \ - ../common/config.cpp \ - ../common/date.cpp \ - ../common/datstrm.cpp \ - ../common/dcbase.cpp \ - ../common/dlgcmn.cpp \ - ../common/docmdi.cpp \ - ../common/docview.cpp \ - ../common/dynarray.cpp \ - ../common/dynlib.cpp \ - ../common/event.cpp \ - ../common/file.cpp \ - ../common/fileconf.cpp \ - ../common/filefn.cpp \ - ../common/framecmn.cpp \ - ../common/ftp.cpp \ - ../common/gdicmn.cpp \ - ../common/hash.cpp \ - ../common/helpbase.cpp \ - ../common/http.cpp \ - ../common/image.cpp \ - ../common/imagjpeg.cpp \ - ../common/imagbmp.cpp \ - ../common/imaggif.cpp \ - ../common/imagpng.cpp \ - ../common/intl.cpp \ - ../common/ipcbase.cpp \ - ../common/layout.cpp \ - ../common/list.cpp \ - ../common/log.cpp \ - ../common/longlong.cpp \ - ../common/matrix.cpp \ - ../common/memory.cpp \ - ../common/mimetype.cpp \ - ../common/module.cpp \ - ../common/mstream.cpp \ - ../common/object.cpp \ - ../common/objstrm.cpp \ - ../common/odbc.cpp \ - ../common/paper.cpp \ - ../common/prntbase.cpp \ - ../common/process.cpp \ - ../common/protocol.cpp \ - ../common/resource.cpp \ - ../common/sckaddr.cpp \ - ../common/sckfile.cpp \ - ../common/sckint.cpp \ - ../common/sckipc.cpp \ - ../common/sckstrm.cpp \ - ../common/serbase.cpp \ - ../common/socket.cpp \ - ../common/stream.cpp \ - ../common/string.cpp \ - ../common/tbarbase.cpp \ - ../common/tbarsmpl.cpp \ - ../common/textfile.cpp \ - ../common/time.cpp \ - ../common/timercmn.cpp \ - ../common/tokenzr.cpp \ - ../common/url.cpp \ - ../common/utilscmn.cpp \ - ../common/valgen.cpp \ - ../common/validate.cpp \ - ../common/valtext.cpp \ - ../common/variant.cpp \ - ../common/wfstream.cpp \ - ../common/wincmn.cpp \ - ../common/wxchar.cpp \ - ../common/wxexpr.cpp \ - ../common/zstream.cpp \ -\ - ../common/db.cpp \ - ../common/dbtable.cpp \ -\ - ../unix/threadpsx.cpp \ - ../unix/utilsunx.cpp \ -\ - ../generic/caret.cpp \ - ../generic/colrdlgg.cpp \ - ../generic/dcpsg.cpp \ - ../generic/dirdlgg.cpp \ - ../generic/fontdlgg.cpp \ - ../generic/gridg.cpp \ - ../generic/helpext.cpp \ - ../generic/helphtml.cpp \ - ../generic/imaglist.cpp \ - ../generic/laywin.cpp \ - ../generic/listctrl.cpp \ - ../generic/panelg.cpp \ - ../generic/printps.cpp \ - ../generic/prntdlgg.cpp \ - ../generic/progdlgg.cpp \ - ../generic/prop.cpp \ - ../generic/propform.cpp \ - ../generic/proplist.cpp \ - ../generic/sashwin.cpp \ - ../generic/scrolwin.cpp \ - ../generic/splitter.cpp \ - ../generic/statusbr.cpp \ - ../generic/tabg.cpp \ - ../generic/tipdlg.cpp \ - ../generic/treectrl.cpp - - -ZLIB_SRC=\ - ../zlib/adler32.c ../zlib/deflate.c ../zlib/infblock.c\ - ../zlib/inflate.c ../zlib/zutil.c ../zlib/compress.c \ - ../zlib/infcodes.c ../zlib/inftrees.c ../zlib/trees.c \ - ../zlib/crc32.c ../zlib/gzio.c ../zlib/inffast.c\ - ../zlib/infutil.c ../zlib/uncompr.c - -PNG_SRC=\ - ../png/png.c \ - ../png/pngset.c \ - ../png/pngget.c \ - ../png/pngrutil.c \ - ../png/pngtrans.c \ - ../png/pngwutil.c \ - ../png/pngread.c \ - ../png/pngrio.c \ - ../png/pngwio.c \ - ../png/pngwrite.c \ - ../png/pngrtran.c \ - ../png/pngwtran.c \ - ../png/pngmem.c \ - ../png/pngerror.c \ - ../png/pngpread.c - -JPEG_SRC=\ - ../jpeg/jcomapi.c \ - ../jpeg/jutils.c \ - ../jpeg/jerror.c \ - ../jpeg/jmemmgr.c \ - ../jpeg/jmemnobs.c \ - ../jpeg/jcapimin.c \ - ../jpeg/jcapistd.c \ - ../jpeg/jctrans.c \ - ../jpeg/jcparam.c \ - ../jpeg/jdatadst.c \ - ../jpeg/jcinit.c \ - ../jpeg/jcmaster.c \ - ../jpeg/jcmarker.c \ - ../jpeg/jcmainct.c \ - ../jpeg/jcprepct.c \ - ../jpeg/jccoefct.c \ - ../jpeg/jccolor.c \ - ../jpeg/jcsample.c \ - ../jpeg/jchuff.c \ - ../jpeg/jcphuff.c \ - ../jpeg/jcdctmgr.c \ - ../jpeg/jfdctfst.c \ - ../jpeg/jfdctflt.c \ - ../jpeg/jfdctint.c \ - ../jpeg/jdapimin.c \ - ../jpeg/jdapistd.c \ - ../jpeg/jdtrans.c \ - ../jpeg/jdatasrc.c \ - ../jpeg/jdmaster.c \ - ../jpeg/jdinput.c \ - ../jpeg/jdmarker.c \ - ../jpeg/jdhuff.c \ - ../jpeg/jdphuff.c \ - ../jpeg/jdmainct.c \ - ../jpeg/jdcoefct.c \ - ../jpeg/jdpostct.c \ - ../jpeg/jddctmgr.c \ - ../jpeg/jidctfst.c \ - ../jpeg/jidctflt.c \ - ../jpeg/jidctint.c \ - ../jpeg/jidctred.c \ - ../jpeg/jdsample.c \ - ../jpeg/jdcolor.c \ - ../jpeg/jquant1.c \ - ../jpeg/jquant2.c \ - ../jpeg/jdmerge.c - -LIB_C_SRC=\ -\ - win_gtk.c \ - ../common/y_tab.c \ - ../common/extended.c - -# Only need to compile zlib files if we don't -# already have a zlib library installed on our system -# (or we wish to statically link them for some reason) -EXTRA_C_SRC=\ - $(ZLIB_SRC) $(PNG_SRC) $(JPEG_SRC) - -all: $(WXLIB) - -# Define library objects -OBJECTS=\ - $(LIB_CPP_SRC:.cpp=.o) $(LIB_C_SRC:.c=.o) $(EXTRA_C_SRC:.c=.o) - -$(WXLIB) : $(OBJECTS) - ar $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - -../common/y_tab.$(OBJSUFF): ../common/y_tab.c ../common/lex_yy.c - $(CCLEX) -c $(CFLAGS) -DNO_CONFIGURE -o $@ ../common/y_tab.c - -# Replace lex with flex if you run into compilation -# problems with lex_yy.c. See also note about LEX_SCANNER -# above. -../common/lex_yy.c: ../common/lexer.l - $(LEX) -o../common/lex.yy.c ../common/lexer.l - sed -e "s/BUFSIZ/5000/g" < ../common/lex.yy.c | \ - sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \ - sed -e "s/YYLMAX 200/YYLMAX 5000/g" > ../common/lex_yy.c - /bin/rm -f ../common/lex.yy.c - -# Replace yacc with bison if you run into compilation -# problems with y_tab.c. -../common/y_tab.c: ../common/parser.y - $(YACC) ../common/parser.y - mv y.tab.c ../common/y_tab.c - -clean: - rm -f $(OBJECTS) $(WXLIB) - diff --git a/src/gtk1/makefile.gnu b/src/gtk1/Makefile similarity index 89% rename from src/gtk1/makefile.gnu rename to src/gtk1/Makefile index a5a84ef35f..5510837def 100644 --- a/src/gtk1/makefile.gnu +++ b/src/gtk1/Makefile @@ -13,64 +13,9 @@ # # Makefile for libwx_gtk.a -# GUI -GUI = gtk - -# Replace this with your own path if necessary WXDIR = ../.. -# C++ compiler -CC = gcc - -# C compiler -CCC = gcc - -# Compiler for lex/yacc .c programs -CCLEX = $(CCC) - -LEX = lex -YACC = yacc -# Note: if using bison, use -y option for yacc compatibility -# YACC = bison -y -MAKE = make -AROPTIONS = ruv -RANLIB = ranlib - -# Debug/trace mode. 1 or more for debugging. -DEBUG = 1 - -# Misc options -CPPOPTIONS = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT -fno-rtti -fno-exceptions -COPTIONS = -D__WXGTK__ -D__WXDEBUG__ -D_REENTRANT -CPPWARN = -Wall -CWARN = -OPTIMISE = -O2 -fno-strength-reduce - -# object file suffix -OBJSUFF =o - -# no changes below this line - -GUIINCLUDES = `gtk-config --cflags` - -WXINC = -I$(WXDIR)/include -WXLIB = $(WXDIR)/lib/libwx_$(GUI).a -INCLUDES = $(WXINC) $(GUIINCLUDES) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib - -CPPFLAGS = $(INCLUDES) $(CPPOPTIONS) $(CPPWARN) $(OPTIMISE) -CFLAGS = $(INCLUDES) $(COPTIONS) $(CWARN) $(OPTIMISE) - -# Clears all default suffixes -.SUFFIXES: .o .cpp .c - -.c.o : - $(CCC) -c $(CFLAGS) -o $@ $< - -.cpp.o : - $(CC) -c $(CPPFLAGS) -o $@ $< - -.C.o : - $(CC) -c $(CPPFLAGS) -o $@ $< +include $(WXDIR)/src/gtk.env # Subordinate library possibilities diff --git a/src/gtk1/makefile.unx b/src/gtk1/makefile.unx deleted file mode 100644 index 6d91815fb9..0000000000 --- a/src/gtk1/makefile.unx +++ /dev/null @@ -1,296 +0,0 @@ -# -# File: makefile.unx -# Author: Robert Roebling -# Created: 1998 -# Updated: -# Copyright: (c) 1998, 1999 -# -# -# Makefile for wxWindows library, GTK 1.2, Unix -# - -EXTRACFLAGS=-DLEX_SCANNER - -include ../make.env - -LIB_CPP_SRC=\ -\ - accel.cpp \ - app.cpp \ - bitmap.cpp \ - bmpbuttn.cpp \ - brush.cpp \ - button.cpp \ - checkbox.cpp \ - checklst.cpp \ - choice.cpp \ - choicdlg.cpp \ - clipbrd.cpp \ - colour.cpp \ - combobox.cpp \ - control.cpp \ - cursor.cpp \ - data.cpp \ - dataobj.cpp \ - dc.cpp \ - dcclient.cpp \ - dcmemory.cpp \ - dcscreen.cpp \ - dialog.cpp \ - dnd.cpp \ - filedlg.cpp \ - font.cpp \ - frame.cpp \ - gauge.cpp \ - gdiobj.cpp \ - icon.cpp \ - listbox.cpp \ - main.cpp \ - mdi.cpp \ - menu.cpp \ - minifram.cpp \ - msgdlg.cpp \ - notebook.cpp \ - palette.cpp \ - pen.cpp \ - radiobox.cpp \ - radiobut.cpp \ - region.cpp \ - scrolbar.cpp \ - settings.cpp \ - slider.cpp \ - spinbutt.cpp \ - statbmp.cpp \ - statbox.cpp \ - statline.cpp \ - stattext.cpp \ - tbargtk.cpp \ - textctrl.cpp \ - textdlg.cpp \ - timer.cpp \ - tooltip.cpp \ - utilsgtk.cpp \ - utilsres.cpp \ - wave.cpp \ - window.cpp \ -\ - ../common/cmndata.cpp \ - ../common/config.cpp \ - ../common/date.cpp \ - ../common/datstrm.cpp \ - ../common/dcbase.cpp \ - ../common/dlgcmn.cpp \ - ../common/docmdi.cpp \ - ../common/docview.cpp \ - ../common/dynarray.cpp \ - ../common/dynlib.cpp \ - ../common/event.cpp \ - ../common/file.cpp \ - ../common/fileconf.cpp \ - ../common/filefn.cpp \ - ../common/framecmn.cpp \ - ../common/ftp.cpp \ - ../common/gdicmn.cpp \ - ../common/hash.cpp \ - ../common/helpbase.cpp \ - ../common/http.cpp \ - ../common/image.cpp \ - ../common/imagjpeg.cpp \ - ../common/imagbmp.cpp \ - ../common/imaggif.cpp \ - ../common/imagpng.cpp \ - ../common/intl.cpp \ - ../common/ipcbase.cpp \ - ../common/layout.cpp \ - ../common/list.cpp \ - ../common/log.cpp \ - ../common/longlong.cpp \ - ../common/matrix.cpp \ - ../common/memory.cpp \ - ../common/mimetype.cpp \ - ../common/module.cpp \ - ../common/mstream.cpp \ - ../common/object.cpp \ - ../common/objstrm.cpp \ - ../common/odbc.cpp \ - ../common/paper.cpp \ - ../common/prntbase.cpp \ - ../common/process.cpp \ - ../common/protocol.cpp \ - ../common/resource.cpp \ - ../common/sckaddr.cpp \ - ../common/sckfile.cpp \ - ../common/sckint.cpp \ - ../common/sckipc.cpp \ - ../common/sckstrm.cpp \ - ../common/serbase.cpp \ - ../common/socket.cpp \ - ../common/stream.cpp \ - ../common/string.cpp \ - ../common/tbarbase.cpp \ - ../common/tbarsmpl.cpp \ - ../common/textfile.cpp \ - ../common/time.cpp \ - ../common/timercmn.cpp \ - ../common/tokenzr.cpp \ - ../common/url.cpp \ - ../common/utilscmn.cpp \ - ../common/valgen.cpp \ - ../common/validate.cpp \ - ../common/valtext.cpp \ - ../common/variant.cpp \ - ../common/wfstream.cpp \ - ../common/wincmn.cpp \ - ../common/wxchar.cpp \ - ../common/wxexpr.cpp \ - ../common/zstream.cpp \ -\ - ../common/db.cpp \ - ../common/dbtable.cpp \ -\ - ../unix/threadpsx.cpp \ - ../unix/utilsunx.cpp \ -\ - ../generic/caret.cpp \ - ../generic/colrdlgg.cpp \ - ../generic/dcpsg.cpp \ - ../generic/dirdlgg.cpp \ - ../generic/fontdlgg.cpp \ - ../generic/gridg.cpp \ - ../generic/helpext.cpp \ - ../generic/helphtml.cpp \ - ../generic/imaglist.cpp \ - ../generic/laywin.cpp \ - ../generic/listctrl.cpp \ - ../generic/panelg.cpp \ - ../generic/printps.cpp \ - ../generic/prntdlgg.cpp \ - ../generic/progdlgg.cpp \ - ../generic/prop.cpp \ - ../generic/propform.cpp \ - ../generic/proplist.cpp \ - ../generic/sashwin.cpp \ - ../generic/scrolwin.cpp \ - ../generic/splitter.cpp \ - ../generic/statusbr.cpp \ - ../generic/tabg.cpp \ - ../generic/tipdlg.cpp \ - ../generic/treectrl.cpp - - -ZLIB_SRC=\ - ../zlib/adler32.c ../zlib/deflate.c ../zlib/infblock.c\ - ../zlib/inflate.c ../zlib/zutil.c ../zlib/compress.c \ - ../zlib/infcodes.c ../zlib/inftrees.c ../zlib/trees.c \ - ../zlib/crc32.c ../zlib/gzio.c ../zlib/inffast.c\ - ../zlib/infutil.c ../zlib/uncompr.c - -PNG_SRC=\ - ../png/png.c \ - ../png/pngset.c \ - ../png/pngget.c \ - ../png/pngrutil.c \ - ../png/pngtrans.c \ - ../png/pngwutil.c \ - ../png/pngread.c \ - ../png/pngrio.c \ - ../png/pngwio.c \ - ../png/pngwrite.c \ - ../png/pngrtran.c \ - ../png/pngwtran.c \ - ../png/pngmem.c \ - ../png/pngerror.c \ - ../png/pngpread.c - -JPEG_SRC=\ - ../jpeg/jcomapi.c \ - ../jpeg/jutils.c \ - ../jpeg/jerror.c \ - ../jpeg/jmemmgr.c \ - ../jpeg/jmemnobs.c \ - ../jpeg/jcapimin.c \ - ../jpeg/jcapistd.c \ - ../jpeg/jctrans.c \ - ../jpeg/jcparam.c \ - ../jpeg/jdatadst.c \ - ../jpeg/jcinit.c \ - ../jpeg/jcmaster.c \ - ../jpeg/jcmarker.c \ - ../jpeg/jcmainct.c \ - ../jpeg/jcprepct.c \ - ../jpeg/jccoefct.c \ - ../jpeg/jccolor.c \ - ../jpeg/jcsample.c \ - ../jpeg/jchuff.c \ - ../jpeg/jcphuff.c \ - ../jpeg/jcdctmgr.c \ - ../jpeg/jfdctfst.c \ - ../jpeg/jfdctflt.c \ - ../jpeg/jfdctint.c \ - ../jpeg/jdapimin.c \ - ../jpeg/jdapistd.c \ - ../jpeg/jdtrans.c \ - ../jpeg/jdatasrc.c \ - ../jpeg/jdmaster.c \ - ../jpeg/jdinput.c \ - ../jpeg/jdmarker.c \ - ../jpeg/jdhuff.c \ - ../jpeg/jdphuff.c \ - ../jpeg/jdmainct.c \ - ../jpeg/jdcoefct.c \ - ../jpeg/jdpostct.c \ - ../jpeg/jddctmgr.c \ - ../jpeg/jidctfst.c \ - ../jpeg/jidctflt.c \ - ../jpeg/jidctint.c \ - ../jpeg/jidctred.c \ - ../jpeg/jdsample.c \ - ../jpeg/jdcolor.c \ - ../jpeg/jquant1.c \ - ../jpeg/jquant2.c \ - ../jpeg/jdmerge.c - -LIB_C_SRC=\ -\ - win_gtk.c \ - ../common/y_tab.c \ - ../common/extended.c - -# Only need to compile zlib files if we don't -# already have a zlib library installed on our system -# (or we wish to statically link them for some reason) -EXTRA_C_SRC=\ - $(ZLIB_SRC) $(PNG_SRC) $(JPEG_SRC) - -all: $(WXLIB) - -# Define library objects -OBJECTS=\ - $(LIB_CPP_SRC:.cpp=.o) $(LIB_C_SRC:.c=.o) $(EXTRA_C_SRC:.c=.o) - -$(WXLIB) : $(OBJECTS) - ar $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - -../common/y_tab.$(OBJSUFF): ../common/y_tab.c ../common/lex_yy.c - $(CCLEX) -c $(CFLAGS) -DNO_CONFIGURE -o $@ ../common/y_tab.c - -# Replace lex with flex if you run into compilation -# problems with lex_yy.c. See also note about LEX_SCANNER -# above. -../common/lex_yy.c: ../common/lexer.l - $(LEX) -o../common/lex.yy.c ../common/lexer.l - sed -e "s/BUFSIZ/5000/g" < ../common/lex.yy.c | \ - sed -e "s/yyoutput(c)/void yyoutput(c)/g" | \ - sed -e "s/YYLMAX 200/YYLMAX 5000/g" > ../common/lex_yy.c - /bin/rm -f ../common/lex.yy.c - -# Replace yacc with bison if you run into compilation -# problems with y_tab.c. -../common/y_tab.c: ../common/parser.y - $(YACC) ../common/parser.y - mv y.tab.c ../common/y_tab.c - -clean: - rm -f $(OBJECTS) $(WXLIB) - diff --git a/src/makelib.gtk b/src/makelib.gtk new file mode 100644 index 0000000000..0c7e6eaac5 --- /dev/null +++ b/src/makelib.gtk @@ -0,0 +1,21 @@ +# +# File: makelib.gtk +# Author: Robert Roebling +# Created: 1999 +# Updated: +# Copyright: (c) Robert Roebling, 1999 +# +# + +WXDIR = $(WXWIN) + +include $(WXDIR)/src/gtk.env + +all: $(LIBTARGET) + +$(LIBTARGET): $(OBJECTS) + ar $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ + +clean: + rm -f $(OBJECTS) $(LIBTARGET) core *.rsc *.res diff --git a/src/makeprog.gtk b/src/makeprog.gtk new file mode 100644 index 0000000000..c9eabec96f --- /dev/null +++ b/src/makeprog.gtk @@ -0,0 +1,13 @@ +# Make environment for making samples for wxGTK + +WXDIR = $(WXWIN) + +include $(WXDIR)/src/gtk.env + +all: $(PROGRAM) + +$(PROGRAM): $(OBJECTS) $(WXLIB) + $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS) + +clean: + rm -f $(OBJECTS) $(PROGRAM) core -- 2.45.2