From 6158481fe536973633b4752459b2e06ba7f9413f Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 17 Mar 2000 10:08:07 +0000 Subject: [PATCH] Added some makefiles, more BC++/win16 fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/generic.rsp | 19 ++++++++----------- distrib/msw/makefile.rsp | 22 ++++++++++++++++++++++ distrib/msw/vc.rsp | 3 +++ src/msw/makefile.bcc | 17 +++-------------- src/xpm/makefile.bcc | 11 +++++++++++ src/xpm/xpmi.h | 2 +- utils/hhp2cached/hhp2cached.cpp | 11 ++++++++++- utils/hhp2cached/hhp2cached.def | 7 +++++++ utils/hhp2cached/hhp2cached.rc | 1 + utils/hhp2cached/makefile.b32 | 16 ++++++++++++++++ utils/hhp2cached/makefile.g95 | 16 ++++++++++++++++ utils/hhp2cached/makefile.vc | 18 ++++++++++++++++++ utils/hhp2cached/makefile.wat | 15 +++++++++++++++ 13 files changed, 131 insertions(+), 27 deletions(-) create mode 100644 src/xpm/makefile.bcc create mode 100644 utils/hhp2cached/hhp2cached.def create mode 100644 utils/hhp2cached/hhp2cached.rc create mode 100644 utils/hhp2cached/makefile.b32 create mode 100644 utils/hhp2cached/makefile.g95 create mode 100644 utils/hhp2cached/makefile.vc create mode 100644 utils/hhp2cached/makefile.wat diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 4c95514570..59f5bcf43c 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -18,9 +18,7 @@ template.mak wx-config.in makefile.unx.in wxinstall -descrip.mms setup.h_vms -src/common/descrip.mms distrib/msw/*.rsp distrib/msw/*.bat @@ -117,7 +115,6 @@ src/zlib/*.txt src/zlib/makefile* src/zlib/*.com src/zlib/*.3 -src/zlib/*.mms include/wx/*.h include/wx/*.inl @@ -180,14 +177,14 @@ utils/dialoged/test/*.ico utils/dialoged/test/*.prj utils/dialoged/test/*.bmp -utils/hhp2cache/*.h -utils/hhp2cache/*.cpp -utils/hhp2cache/*.def -utils/hhp2cache/*.rc -utils/hhp2cache/makefile* -utils/hhp2cache/*.xbm -utils/hhp2cache/*.xpm -utils/hhp2cache/*.txt +utils/hhp2cached/*.h +utils/hhp2cached/*.cpp +utils/hhp2cached/*.def +utils/hhp2cached/*.rc +utils/hhp2cached/makefile* +utils/hhp2cached/*.xbm +utils/hhp2cached/*.xpm +utils/hhp2cached/*.txt contrib/configure contrib/configure.in diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index d51c9456e0..b804d7ea7e 100644 --- a/distrib/msw/makefile.rsp +++ b/distrib/msw/makefile.rsp @@ -79,3 +79,25 @@ contrib/samples/ogl/studio/Makefile.in contrib/samples/mmedia/Makefile.in contrib/samples/stc/Makefile.in +descrip.mms +contrib\samples\mmedia\descrip.mms +deliver\wx\src\common\descrip.mms +deliver\wx\src\png\scripts\descrip.mms +deliver\wx\src\zlib\descrip.mms +demos\bombs\descrip.mms +samples\caret\descrip.mms +samples\checklst\descrip.mms +samples\config\descrip.mms +samples\controls\descrip.mms +samples\dialogs\descrip.mms +samples\image\descrip.mms +samples\menu\descrip.mms +samples\minimal\descrip.mms +src\common\descrip.mms +src\generic\descrip.mms +src\gtk\descrip.mms +src\motif\descrip.mms +src\png\scripts\descrip.mms +src\unix\descrip.mms +src\zlib\descrip.mms +utils\dialoged\src\descrip.mms diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp index 3bc5d08162..fd4b8ce900 100644 --- a/distrib/msw/vc.rsp +++ b/distrib/msw/vc.rsp @@ -244,6 +244,9 @@ utils/dialoged/src/DialogEdVC.dsw utils/tex2rtf/src/Tex2RTFVC.dsp utils/tex2rtf/src/Tex2RTFVC.dsw +utils/hhp2cached/hhp2cachedVC.dsp +utils/hhp2cached/hhp2cachedVC.dsw + contrib/src/ogl/OglVC.dsp contrib/src/ogl/OglVC.dsw diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc index a9c4229610..c3b720ebdd 100644 --- a/src/msw/makefile.bcc +++ b/src/msw/makefile.bcc @@ -40,7 +40,7 @@ THISDIR = $(WXDIR)\src\msw # Please set these according to the settings in wx_setup.h, so we can include # the appropriate libraries in wx.lib USE_CTL3D=1 -USE_XPM_IN_MSW=0 +USE_XPM_IN_MSW=1 PERIPH_LIBS= PERIPH_TARGET= @@ -51,7 +51,7 @@ PERIPH_LIBS=$(WXDIR)\lib\bcc16\ctl3dv2.lib $(PERIPH_LIBS) !endif !if "$(USE_XPM_IN_MSW)" == "1" -PERIPH_LIBS=$(WXDIR)\xpm.lib $(PERIPH_LIBS) +PERIPH_LIBS=$(WXDIR)\lib\xpm.lib $(PERIPH_LIBS) PERIPH_TARGET=xpm $(PERIPH_TARGET) PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET) !endif @@ -706,8 +706,6 @@ $(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF) $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF) - - all_utils: cd $(WXDIR)\utils make -f makefile.bcc @@ -723,17 +721,8 @@ all_execs: make -f makefile.bcc all_execs cd $(WXDIR)\src\msw -all_libs: - cd $(WXDIR)\src\msw - make -f makefile.bcc dib fafa gauge hytext itsy prologio rcparser wx wxgraph\ - wxstring wxtree mfutils # wxxpm - -all_contribs: - cd $(WXDIR)\src\msw - make -f makefile.bcc fafa wxstring itsy gauge # wxxpm - # CONTRIB -wxxpm: $(CFG) +xpm: $(CFG) cd $(WXDIR)\src\xpm make -f makefile.bcc -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG) cd $(WXDIR)\src\msw diff --git a/src/xpm/makefile.bcc b/src/xpm/makefile.bcc new file mode 100644 index 0000000000..b01c0cb6de --- /dev/null +++ b/src/xpm/makefile.bcc @@ -0,0 +1,11 @@ +# Makefile for xpm +# Borland C++ + + +LIBTARGET=$(WXDIR)\lib\xpm.lib + +OBJECTS = attrib.obj crbuffri.obj crdatfri.obj create.obj crifrbuf.obj crifrdat.obj\ + data.obj image.obj info.obj hashtab.obj misc.obj parse.obj\ + rdftodat.obj rdftoi.obj rgb.obj scan.obj simx.obj wrffrdat.obj wrffri.obj + +!include $(WXWIN)\src\makelib.bcc diff --git a/src/xpm/xpmi.h b/src/xpm/xpmi.h index d171ecc1a4..c5ebaeb72b 100644 --- a/src/xpm/xpmi.h +++ b/src/xpm/xpmi.h @@ -45,7 +45,7 @@ #include "xpm.h" // Added by JACS for some compilers (no popen/pclose functions) -#if defined(__WATCOMC__) || (!defined(WIN32) && defined(_MSC_VER)) +#if defined(__WATCOMC__) || (!defined(WIN32) && defined(_MSC_VER)) || (!defined(WIN32) && defined(__BORLANDC__)) #define NO_ZPIPE #endif diff --git a/utils/hhp2cached/hhp2cached.cpp b/utils/hhp2cached/hhp2cached.cpp index 4c6f30c52c..471fa04eea 100644 --- a/utils/hhp2cached/hhp2cached.cpp +++ b/utils/hhp2cached/hhp2cached.cpp @@ -6,8 +6,17 @@ */ +// For compilers that support precompilation, includes "wx/wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#ifndef WX_PRECOMP +#include "wx/wx.h" +#endif -#include #include diff --git a/utils/hhp2cached/hhp2cached.def b/utils/hhp2cached/hhp2cached.def new file mode 100644 index 0000000000..76113fa938 --- /dev/null +++ b/utils/hhp2cached/hhp2cached.def @@ -0,0 +1,7 @@ +NAME hhp2cached +DESCRIPTION 'hhp2cached utility' +EXETYPE WINDOWS +CODE PRELOAD MOVEABLE DISCARDABLE +DATA PRELOAD MOVEABLE MULTIPLE +HEAPSIZE 4048 +STACKSIZE 16000 diff --git a/utils/hhp2cached/hhp2cached.rc b/utils/hhp2cached/hhp2cached.rc new file mode 100644 index 0000000000..b86c4e2265 --- /dev/null +++ b/utils/hhp2cached/hhp2cached.rc @@ -0,0 +1 @@ +#include "wx/msw/wx.rc" diff --git a/utils/hhp2cached/makefile.b32 b/utils/hhp2cached/makefile.b32 new file mode 100644 index 0000000000..c6e37fd874 --- /dev/null +++ b/utils/hhp2cached/makefile.b32 @@ -0,0 +1,16 @@ +# +# File: makefile.b32 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: +# +# Makefile : Builds sample for 32-bit BC++ + +WXDIR = $(WXWIN) + +TARGET=hhp2cached +OBJECTS = $(TARGET).obj + +!include $(WXDIR)\src\makeprog.b32 + diff --git a/utils/hhp2cached/makefile.g95 b/utils/hhp2cached/makefile.g95 new file mode 100644 index 0000000000..e2a0470926 --- /dev/null +++ b/utils/hhp2cached/makefile.g95 @@ -0,0 +1,16 @@ +# +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 +# +# Makefile for wxWindows sample (Cygwin/Mingw32). + +WXDIR = ../.. + +TARGET=hhp2cached +OBJECTS = $(TARGET).o + +include $(WXDIR)/src/makeprog.g95 + diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc new file mode 100644 index 0000000000..cdbc91c9a8 --- /dev/null +++ b/utils/hhp2cached/makefile.vc @@ -0,0 +1,18 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart +# +# Makefile : Builds sample (VC++, WIN32) +# Use FINAL=1 argument to nmake to build final version with no debug info. + +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=hhp2cached +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat new file mode 100644 index 0000000000..7d2d392024 --- /dev/null +++ b/utils/hhp2cached/makefile.wat @@ -0,0 +1,15 @@ +# +# Makefile for WATCOM +# +# Created by Julian Smart, January 1999 +# +# + +WXDIR = $(%WXWIN) + +PROGRAM = hhp2cached +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.wat + +