From f6190422cce8c02e28b037f7512edeb23af110e6 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 29 Aug 2002 04:15:03 +0000 Subject: [PATCH] moved mingw info to README --- README | 78 ++++++++++++++++++++++++++++++++++++++++++++++------- mingw32.txt | 56 -------------------------------------- 2 files changed, 69 insertions(+), 65 deletions(-) delete mode 100644 mingw32.txt diff --git a/README b/README index 0b0874e4..f7862d74 100644 --- a/README +++ b/README @@ -1,21 +1,20 @@ =========== -D2X + D2X =========== http://icculus.org/d2x -Linux: -====== + +Linux/Unix: +=========== Required tools: * GCC 2.95 * SDL 1.1.0 or higher - (get it from http://www.devolution.com/~slouken/projects/SDL/) -* NASM 0.98 (OPTIONAL but RECOMMENDED, not sure, try your linux distribution) +* NASM 0.98 (OPTIONAL but RECOMMENDED for x86) * A thread safe X server. * Make, sed, etc... - Build instructions: Install all of the components above. Next, from the d2x directory: @@ -23,17 +22,78 @@ Install all of the components above. Next, from the d2x directory: ./configure --help will show you the available options. If you have a 3d graphics card, use --with-opengl +VPATH builds also work (i.e., you can put the source in one directory +and build in another. Just execute the configure script from the +build directory like so: +mkdir d2x-build +cd d2x-build +../d2x-source/configure + make make install see installation.txt for info on where to put your datafiles, etc. - Known bugs/issues: -* Serial support doesn't work. (UDP and IPX networking does) + +* Serial support doesn't work. (UDP and IPX networking does (btb: it + does? UDP?!)) + + * Sound glitches (due to stuff I haven't implemented) * The mouse support is at the same level as it was in d1x (as in, it - kind of works) + kind of works) (btb: works pretty good for me.) + + +Win32: +====== + +Required tools: +* Cygwin + d2x doesn't use Cygwin, but it makes building it easier (to me). + You can probably build it with just MinGW, but I haven't tried yet. +* SDL 1.1.0 or higher +* NASM 0.98 (OPTIONAL but RECOMMENDED) + +You will probably have to compile SDL from source. +Download the source code tarball from http://www.libsdl.org/ + +tar zxf SDL-x.x.x.tar.gz +cd SDL-x.x.x +./configure +make +make install + +Note that SDL.dll needs to be in your executable PATH, since that is +where windows looks for dlls. +I recommend copying or moving it to /usr/local/bin: +cp /usr/local/lib/SDL.dll /usr/local/bin + +If you need to run autogen.sh (e.g. to rebuild the configure scripts, +or to build from cvs) sdl.m4 will have to be somewhere where aclocal +can find it. +You can fix this by setting the ACLOCAL_FLAGS variable like this: +export ACLOCAL_FLAGS=/usr/local/share/aclocal + +You should also install NASM, for compiling assembler files. Download +it from http://www.web-sites.co.uk/nasm/where.html and place nasmw.exe +somewhere in your path (e.g. /usr/local/bin): +unzip nasm-0.98-win32.zip +mv nasmw.exe /usr/local/bin + +Now you can configure d2x as normal. i.e. +./configure +or +./configure --with-opengl + +automake/autoconf in cygwin has a problem with not always putting the +.exe extentions where they need to be. So you may have to run make +twice, like so: +make && make d2x-sdl.exe +or +make && make d2x-gl.exe + +Then just copy your executable and SDL.dll into the descent2 directory. MS-DOS: diff --git a/mingw32.txt b/mingw32.txt deleted file mode 100644 index c0ebed65..00000000 --- a/mingw32.txt +++ /dev/null @@ -1,56 +0,0 @@ -Instructions for building D2X for MinGW32 ------------------------------------------ - -Using Cygwin ------------- -First you will need SDL. -Download the source code tarball from http://www.libsdl.org/ -Currently, it is SDL-1.2.3.tar.gz. - -tar zxf SDL-1.2.3.tar.gz -cd SDL-1.2.3 -./configure -make -make install - -Note that SDL.dll needs to be in your executable PATH, since that is -where windows looks for dlls. -I recommend copying it to /usr/local/bin: -cp /usr/local/lib/SDL.dll /usr/local/bin - -If you need to run autogen.sh (e.g. to rebuild the configure scripts, -or to build from cvs) sdl.m4 will have to be somewhere where aclocal -can find it. -You can fix this by setting the ACLOCAL_FLAGS variable like this: -export ACLOCAL_FLAGS=/usr/local/share/aclocal - -You should also install NASM, for compiling assembler files. Download -it from http://www.web-sites.co.uk/nasm/where.html and place nasmw.exe -somewhere in your path (e.g. /usr/local/bin): -unzip nasm-0.98-win32.zip -mv nasmw.exe /usr/local/bin - -Now you can configure d2x as normal. i.e. -./configure -or -./configure --with-opengl - -automake/autoconf in cygwin has a problem with not always putting the -.exe extentions where they need to be. So you may have to run make -twice, like so: -make && make d2x-sdl.exe -or -make && make d2x-ogl.exe - - -Using MinGW32 -------------- -to be added - - -Using Linux ------------ -to be added - - --Bradley Bell -- 2.39.2