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

wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-07-21 17:30:41 +00:00
parent 7e1e696511
commit 1dba7b4c69
6 changed files with 77 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/bakefiles/config.bkl
View File

@@ -53,7 +53,7 @@
Type of compiled binaries Type of compiled binaries
</description> </description>
</option> </option>
<!-- FIXME: restore this once bakefile is fixed to not use <!-- FIXME: restore this once bakefile is fixed to not use
/Gm /GZ (incompatible with /O2) w/ debug-info --> /Gm /GZ (incompatible with /O2) w/ debug-info -->
<set var="DEBUG_INFO_DEFAULT"> <set var="DEBUG_INFO_DEFAULT">
@@ -279,7 +279,7 @@ to run the tests, include CppUnit library here.
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- windows compilers --> <!-- windows/dos/os2 compilers -->
<!-- ================================================================== --> <!-- ================================================================== -->
<if cond="FORMAT!='autoconf'"> <if cond="FORMAT!='autoconf'">
@@ -296,8 +296,10 @@ it if SHARED=1 unless you know what you are doing.
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line --> <set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<set var="TOOLKIT" overwrite="0"> <set var="TOOLKIT" overwrite="0">
<if cond="FORMAT!='msevc4prj'">MSW</if>
<if cond="FORMAT=='msevc4prj'">WINCE</if> <if cond="FORMAT=='msevc4prj'">WINCE</if>
<if cond="FORMAT!='msevc4prj' and PLATFORM_WIN32=='1'">MSW</if>
<if cond="PLATFORM_MSDOS=='1'">DOS</if>
<if cond="PLATFORM_OS2=='1'">PM</if>
</set> </set>
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set> <set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
<set var="TOOLKIT_VERSION"/> <set var="TOOLKIT_VERSION"/>
@@ -401,7 +403,7 @@ Set the version of your Mingw installation here.
<if cond="FORMAT=='msevc4prj'"> <if cond="FORMAT=='msevc4prj'">
<set var="WXUNIV">0</set> <set var="WXUNIV">0</set>
<set var="UNICODE">1</set> <set var="UNICODE">1</set>
<!-- Uploading debug reports from PDAs seems impractical --> <!-- Uploading debug reports from PDAs seems impractical -->
<set var="USE_QA">0</set> <set var="USE_QA">0</set>
<set var="MONOLITHIC">1</set> <!-- sic! --> <set var="MONOLITHIC">1</set> <!-- sic! -->
</if> </if>

3
build/bakefiles/expat.bkl
View File

@@ -29,6 +29,9 @@
<define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'"> <define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
COMPILED_FROM_DSP COMPILED_FROM_DSP
</define> </define>
<define cond="FORMAT=='watcom' and PLATFORM_OS2=='1'">
OS2_32
</define>
<cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland> <cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
<sources> <sources>
src/expat/lib/xmlparse.c src/expat/lib/xmlparse.c

1
build/bakefiles/files.bkl
View File

@@ -1626,6 +1626,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/os2/ownerdrw.cpp src/os2/ownerdrw.cpp
src/os2/palette.cpp src/os2/palette.cpp
src/os2/pen.cpp src/os2/pen.cpp
src/os2/popupwin.cpp
src/os2/print.cpp src/os2/print.cpp
src/os2/radiobox.cpp src/os2/radiobox.cpp
src/os2/radiobut.cpp src/os2/radiobut.cpp

72
build/bakefiles/tiff.bkl
View File

@@ -28,7 +28,8 @@
<set var="TIFF_PLATFORM_SRC"> <set var="TIFF_PLATFORM_SRC">
<if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if> <if cond="PLATFORM_UNIX=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if> <if cond="PLATFORM_MACOSX=='1'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_OS2=='1'">src/tiff/tif_unix.c</if> <if cond="PLATFORM_OS2=='1' and FORMAT!='watcom'">src/tiff/tif_unix.c</if>
<if cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">src/tiff/tif_os2.c</if>
<if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if> <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
<if cond="PLATFORM_MACOS=='1'">src/tiff/tif_apple.c</if> <if cond="PLATFORM_MACOS=='1'">src/tiff/tif_apple.c</if>
<if cond="PLATFORM_MSDOS=='1'">src/tiff/tif_msdos.c</if> <if cond="PLATFORM_MSDOS=='1'">src/tiff/tif_msdos.c</if>
@@ -41,42 +42,43 @@
<include>$(INC_JPEG)</include> <include>$(INC_JPEG)</include>
<cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland> <cflags-borland>-w-8004 -w-8012 -w-8057 -w-8060 -w-8066</cflags-borland>
<cflags-dmars>-w2</cflags-dmars> <cflags-dmars>-w2</cflags-dmars>
<define cond="PLATFORM_OS2=='1' and FORMAT=='watcom'">OS2_32</define>
<sources> <sources>
$(TIFF_PLATFORM_SRC) $(TIFF_PLATFORM_SRC)
src/tiff/tif_aux.c src/tiff/tif_aux.c
src/tiff/tif_close.c src/tiff/tif_close.c
src/tiff/tif_codec.c src/tiff/tif_codec.c
src/tiff/tif_color.c src/tiff/tif_color.c
src/tiff/tif_compress.c src/tiff/tif_compress.c
src/tiff/tif_dir.c src/tiff/tif_dir.c
src/tiff/tif_dirinfo.c src/tiff/tif_dirinfo.c
src/tiff/tif_dirread.c src/tiff/tif_dirread.c
src/tiff/tif_dirwrite.c src/tiff/tif_dirwrite.c
src/tiff/tif_dumpmode.c src/tiff/tif_dumpmode.c
src/tiff/tif_error.c src/tiff/tif_error.c
src/tiff/tif_extension.c src/tiff/tif_extension.c
src/tiff/tif_fax3.c src/tiff/tif_fax3.c
src/tiff/tif_fax3sm.c src/tiff/tif_fax3sm.c
src/tiff/tif_getimage.c src/tiff/tif_getimage.c
src/tiff/tif_jpeg.c src/tiff/tif_jpeg.c
src/tiff/tif_flush.c src/tiff/tif_flush.c
src/tiff/tif_lzw.c src/tiff/tif_lzw.c
src/tiff/tif_luv.c src/tiff/tif_luv.c
src/tiff/tif_next.c src/tiff/tif_next.c
src/tiff/tif_open.c src/tiff/tif_open.c
src/tiff/tif_packbits.c src/tiff/tif_packbits.c
src/tiff/tif_pixarlog.c src/tiff/tif_pixarlog.c
src/tiff/tif_predict.c src/tiff/tif_predict.c
src/tiff/tif_print.c src/tiff/tif_print.c
src/tiff/tif_read.c src/tiff/tif_read.c
src/tiff/tif_swab.c src/tiff/tif_swab.c
src/tiff/tif_strip.c src/tiff/tif_strip.c
src/tiff/tif_thunder.c src/tiff/tif_thunder.c
src/tiff/tif_tile.c src/tiff/tif_tile.c
src/tiff/tif_version.c src/tiff/tif_version.c
src/tiff/tif_warning.c src/tiff/tif_warning.c
src/tiff/tif_write.c src/tiff/tif_write.c
src/tiff/tif_zip.c src/tiff/tif_zip.c
</sources> </sources>
</lib> </lib>

35
build/bakefiles/wx.bkl
View File

@@ -12,13 +12,13 @@
</phony> </phony>
<set var="BUILDING_LIB">1</set> <set var="BUILDING_LIB">1</set>
<!-- common rules, names etc. for wx: --> <!-- common rules, names etc. for wx: -->
<include file="common.bkl"/> <include file="common.bkl"/>
<!-- list of files sorted into categories: --> <!-- list of files sorted into categories: -->
<include file="files.bkl"/> <include file="files.bkl"/>
<!-- wxWidgets variant where everything is in one library: --> <!-- wxWidgets variant where everything is in one library: -->
<include file="monolithic.bkl"/> <include file="monolithic.bkl"/>
<!-- ...and when there are multiple libraries: --> <!-- ...and when there are multiple libraries: -->
@@ -30,21 +30,21 @@
<if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if> <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
</set> </set>
</if> </if>
<!-- OpenGL canvas is built as separate library in both cases: --> <!-- OpenGL canvas is built as separate library in both cases: -->
<include file="opengl.bkl"/> <include file="opengl.bkl"/>
<!-- Dynamically loadable plugins: --> <!-- Dynamically loadable plugins: -->
<include file="plugins.bkl"/> <include file="plugins.bkl"/>
<!-- Samples target (not dependency of 'all'): --> <!-- Samples target (not dependency of 'all'): -->
<subproject id="samples"> <subproject id="samples">
<installable>no</installable> <installable>no</installable>
<dir cond="FORMAT=='autoconf'">samples</dir> <dir cond="FORMAT=='autoconf'">samples</dir>
<dir cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']">../../samples</dir> <dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL']">../../samples</dir>
</subproject> </subproject>
<if cond="FORMAT=='autoconf'"> <if cond="FORMAT=='autoconf'">
<!-- WXRC compiler is built by default: --> <!-- WXRC compiler is built by default: -->
<!-- FIXME: this is dirty hack, better bakefile support for <!-- FIXME: this is dirty hack, better bakefile support for
conditional and optional subprojects is needed --> conditional and optional subprojects is needed -->
@@ -59,7 +59,7 @@
<depends>baselib</depends> <depends>baselib</depends>
<depends>xmldll</depends> <depends>xmldll</depends>
<depends>xmllib</depends> <depends>xmllib</depends>
<command> <command>
(test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) all) || true
</command> </command>
@@ -77,7 +77,7 @@
(test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true (test -d utils/wxrc &amp;&amp; cd utils/wxrc &amp;&amp; $(DOLLAR)(MAKE) install) || true
</command> </command>
</action> </action>
<!-- "make install": --> <!-- "make install": -->
<data-files> <data-files>
@@ -145,26 +145,27 @@
</if> </if>
<!-- copy setup.h on DOS/Windows: --> <!-- copy setup.h on DOS/OS2/Windows: -->
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL']"> <if cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MGL']">
<mkdir id="libdir"> <mkdir id="libdir">
<dir>$(LIBDIRNAME)</dir> <dir>$(LIBDIRNAME)</dir>
</mkdir> </mkdir>
<mkdir id="libdir_setup"> <mkdir id="libdir_setup">
<depends>libdir</depends> <depends>libdir</depends>
<dir>$(SETUPHDIR)</dir> <dir>$(SETUPHDIR)</dir>
</mkdir> </mkdir>
<mkdir id="libdir_setup_wx"> <mkdir id="libdir_setup_wx">
<depends>libdir_setup</depends> <depends>libdir_setup</depends>
<dependency-of>setup_h</dependency-of> <dependency-of>setup_h</dependency-of>
<dir>$(SETUPHDIR)/wx</dir> <dir>$(SETUPHDIR)/wx</dir>
</mkdir> </mkdir>
<set var="SETUP_H_SUBDIR"> <set var="SETUP_H_SUBDIR">
<if cond="WXUNIV=='1'">univ</if> <if cond="WXUNIV=='1'">univ</if>
<if cond="WXUNIV=='0'">$(TOOLKIT_LOWERCASE)</if> <if cond="WXUNIV=='0' and TOOLKIT!='PM'">$(TOOLKIT_LOWERCASE)</if>
<if cond="WXUNIV=='0' and TOOLKIT=='PM'">os2</if>
</set> </set>
<copy-file-to-file-if-not-exist id="master_setup.h"> <copy-file-to-file-if-not-exist id="master_setup.h">
<src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup0.h</src> <src>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup0.h</src>
<dst>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</dst> <dst>$(SRCDIR)/include/wx/$(SETUP_H_SUBDIR)/setup.h</dst>
@@ -209,7 +210,7 @@
<fragment format="autoconf" file="make_dist.mk"/> <fragment format="autoconf" file="make_dist.mk"/>
</if> </if>
<include file="build_cfg.bkl"/> <include file="build_cfg.bkl"/>
</makefile> </makefile>

21
src/tiff/tiffcomp.h
View File

@@ -4,28 +4,28 @@
* Copyright (c) 1990-1997 Sam Leffler * Copyright (c) 1990-1997 Sam Leffler
* Copyright (c) 1991-1997 Silicon Graphics, Inc. * Copyright (c) 1991-1997 Silicon Graphics, Inc.
* *
* Permission to use, copy, modify, distribute, and sell this software and * Permission to use, copy, modify, distribute, and sell this software and
* its documentation for any purpose is hereby granted without fee, provided * its documentation for any purpose is hereby granted without fee, provided
* that (i) the above copyright notices and this permission notice appear in * that (i) the above copyright notices and this permission notice appear in
* all copies of the software and related documentation, and (ii) the names of * all copies of the software and related documentation, and (ii) the names of
* Sam Leffler and Silicon Graphics may not be used in any advertising or * Sam Leffler and Silicon Graphics may not be used in any advertising or
* publicity relating to the software without the specific, prior written * publicity relating to the software without the specific, prior written
* permission of Sam Leffler and Silicon Graphics. * permission of Sam Leffler and Silicon Graphics.
* *
* THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
* EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
* WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
* *
* IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
* ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
* OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
* WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
* LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
* OF THIS SOFTWARE. * OF THIS SOFTWARE.
*/ */
#ifndef _COMPAT_ #ifndef _COMPAT_
#define _COMPAT_ #define _COMPAT_
/* /*
* This file contains a hodgepodge of definitions and * This file contains a hodgepodge of definitions and
* declarations that are needed to provide compatibility * declarations that are needed to provide compatibility
@@ -218,5 +218,8 @@ extern int creat(const char *path, int mode);
#define HOST_BIGENDIAN 0 #define HOST_BIGENDIAN 0
#endif #endif
#ifndef LINKAGEMODE
#define LINKAGEMODE
#endif
#endif /* _COMPAT_ */ #endif /* _COMPAT_ */