From ddbeadf670c9e931b73998880d0557c3cfccb052 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 15 Dec 2009 20:11:29 +0000 Subject: [PATCH] Fixed bug #818 Daniele Forghieri 2009-10-12 02:52:02 PDT Updated makefile & Doc for Open Watcom 1.8 --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404317 --- README.Watcom | 38 ++++++++++++++++++++++---------------- Watcom-Win32.zip | Bin 3709 -> 4899 bytes 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/README.Watcom b/README.Watcom index 2849a11c0..b0ae8b898 100644 --- a/README.Watcom +++ b/README.Watcom @@ -1,29 +1,30 @@ -Using SDL under Windows with the OpenWatcom compiler +Using SDL 1.3 under Windows with the OpenWatcom compiler + ==================================================== Prerequisites ------------- -I have done the port under Windows XP Home with SP2 installed. Windows -2000 should also be working. I'm not so sure about ancient Windows NT, +I have done the port under Windows XP Professional with SP2 installed. +Windows 2000 should also be working. I'm not so sure about ancient Windows NT, since only DirectX 3 is available there. Building should be possible, but running the compiled applications will probalbly fail with SDL_VIDEODRIVER=directx. The windib driver should work, though. To compile and use the SDL with Open Watcom you will need the following: -- Open Watcom compiler. I used version 1.5. The environment variables +- Open Watcom compiler. I used version 1.8. The environment variables PATH, WATCOM and INCLUDE need to be set appropriately - please consult the OpenWatcom documentation and instructions given during the installation of the compiler. My setup looks like this in owvars.bat: - set WATCOM=C:\watcom + set WATCOM=C:\dev\ow18 set INCLUDE=%WATCOM%\h;%WATCOM%\h\nt set PATH=%PATH%;%WATCOM%\binnt;%WATCOM%\binw -- A fairly recent DirectX SDK. The original unmodified DX8 SDK works, as - well as the minimal DirectX 7 SDK from the Allegro download site - (). -- The SDL sources from Subversion +- A recent DirectX SDK. The library needs D3d9.h so at leat the + directx 9 sdk is to be used. I used DirectX 10 SDK from August 2009 + taken directly from the microsoft site. +- The SDL 1.3 sources from Subversion - The file Watcom-Win32.zip (now available in Subversion) @@ -33,13 +34,12 @@ Building the Library 1) In the SDL base directory extract the archive Watcom-Win32.zip. This creates a subdirectory named 'watcom'. 2) The makefile expects the environment variable DXDIR to be set to the - base directory of a DirectX SDK. I have tried a stock DX8 SDK from - Microsoft as well as the minimal DirectX 7 SDK from the Allegro - download site. + base directory of a DirectX SDK. I have tried the August 2009 + DirectX SDK from Microsoft You can also edit the makefile directly and hard code your path to the SDK on your system. I have this in my setup: - set DXDIR=D:\devel\DX8_SDK + set DXDIR=..\dx10 3) Enter the watcom directory and run wmake sdl 4) All tests from the test directory are working and can be built by @@ -71,9 +71,9 @@ Notes: The library can also be built with the stack calling convention of the compiler (-6s instead of -6r). - Test applications ----------------- +$FixME: which test works ? which one compiles ? I've tried to make all tests work. The following table gives an overview of the current status. @@ -126,8 +126,14 @@ There is room for further improvement: Questions and Comments ---------------------- -Please direct any questions or comments to me: +Please direct any questions or comments to me: + + ow_sdl [at] digitalfantasy [dot] it + +The original porting to the open watcom compiler was made by +Marc Peter Happy Coding! - Marc Peter + Daniele Forghieri + diff --git a/Watcom-Win32.zip b/Watcom-Win32.zip index c60af6df43d2ab91ec59bc16d372ee056fcca958..10eee05eac811b84f2795fa48ddeadd2cb3129ee 100644 GIT binary patch literal 4899 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 a&i|9KdYX9ne@ActIDl>d0H90x*YRK6;|T2l literal 3709 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