From 6c06403b4bd58ba892a346d39d7d412a3a3aa37a 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 --- 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 delta 4814 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