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

8
build/bakefiles/config.bkl
View File

@@ -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>

9
build/bakefiles/wx.bkl
View File

@@ -40,7 +40,7 @@
<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'">
@@ -145,8 +145,8 @@
</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>
@@ -162,7 +162,8 @@
<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">

5
src/tiff/tiffcomp.h
View File

@@ -25,7 +25,7 @@
*/ */
#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_ */