From 9227c254d1156fd6db0e4f20f62def05543b9238 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 28 Dec 2019 18:34:16 +0100 Subject: [PATCH] - removed compile instructions for libraries that are no longer needed. Only libvpx is still required, the rest has been replaced by libsndfile.dll. --- platform/Windows/lib/instructions.txt | 147 -------------------------- platform/Windows/lib/minipng.dfa | 59 ----------- 2 files changed, 206 deletions(-) delete mode 100755 platform/Windows/lib/minipng.dfa diff --git a/platform/Windows/lib/instructions.txt b/platform/Windows/lib/instructions.txt index 8c4b4a295..4ab9340ed 100644 --- a/platform/Windows/lib/instructions.txt +++ b/platform/Windows/lib/instructions.txt @@ -27,85 +27,6 @@ http://wiki.eduke32.com/wiki/Working_with_the_Windows_Command_Prompt [//]: # (Plain text readers: This refers to lines beginning with exactly four spaces.) -libogg ------- -### Download ### -Download: libogg-.tar.xz - * Stable: https://www.xiph.org/downloads/ - * Git: https://git.xiph.org/ogg.git -### Build ### - sh ./configure && make -### Desired Results ### - * headers: ogg/config_types.h ogg/ogg.h ogg/os_types.h - * libraries: libogg.a - -libvorbis ---------- -### Prerequisites ### -libvorbis depends on the results of libogg to compile. -### Download ### -Download: libvorbis-.tar.xz - * Stable: https://www.xiph.org/downloads/ - * Git: https://git.xiph.org/vorbis.git -### Build ### - sh ./configure && make -### Desired Results ### - * headers: vorbis/codec.h vorbis/vorbisfile.h - * libraries: libvorbis.a libvorbisfile.a - -libFLAC -------- -### Prerequisites ### -libFLAC depends on the results of libogg to compile. -### Download ### -Download: flac-.tar.xz -However, Git HEAD is highly recommended. - * Stable: https://www.xiph.org/downloads/ - * Git: git://git.xiph.org/flac.git -### Build ### - make -f Makefile.lite libFLAC -### Desired Results ### - * headers: FLAC/all.h FLAC/assert.h FLAC/callback.h FLAC/export.h FLAC/format.h FLAC/metadata.h FLAC/ordinals.h FLAC/stream_decoder.h FLAC/stream_encoder.h - * libraries: libFLAC.a - - -zlib ----- -### Download ### -Download: zlib-.tar.xz - * Stable: http://zlib.net/ - * Git: git://github.com/madler/zlib.git -### Modifications ### - * Modify win32/Makefile.gcc as follows: - * CFLAGS: change -O3 to -O2 for stability and possibly performance benefits. -### Build ### - make -f win32/Makefile.gcc - ar rcs libz_mini.a crc32.o deflate.o adler32.o zutil.o trees.o -### Desired Results ### - * headers: (none) - * libraries: libz_mini.a - -libpng ------- -### Prerequisites ### -Copy *.h from zlib to your compiler's include directory. -### Download ### -Download libpng-.tar.xz - * Stable: http://www.libpng.org/pub/png/libpng.html - * Git: git://git.code.sf.net/p/libpng/code -### Modifications ### - * Modify scripts/Makefile.gcc as follows: - * Ensure ZLIBINC and ZLIBLIB point to the directory of zlib from above, or, rename your zlib directory so that, relative to the libpng directory, it is "../zlib". You will get a compile-time error if this is omitted or done incorrectly. - * Copy the file "minipng.dfa" to the root of the libpng data. -### Build ### - make -f scripts/pnglibconf.mak DFA_XTRA=./minipng.dfa CPP="gcc -E" - make -f scripts/makefile.gcc libpng.a - ren libpng.a libpng_mini.a -### Desired Results ### - * headers: png.h pngconf.h pnglibconf.h - * libraries: libpng_mini.a - - libvpx ------ ### Prerequisites ### @@ -121,71 +42,3 @@ The build environment needs pr.exe (https://mingw-lib.googlecode.com/files/coreu * headers: vpx/vp8.h vpx/vp8dx.h vpx/vpx_codec.h vpx/vpx_decoder.h vpx/vpx_frame_buffer.h vpx/vpx_image.h vpx/vpx_integer.h * libraries: libvpx.a - -SDL ---- -### Download ### -Download SDL2-devel--mingw.tar.gz - * Stable: http://www.libsdl.org/download-2.0.php - * Mercurial: http://hg.libsdl.org/SDL -### Build ### - sh ./configure && make -### Desired Results ### - * headers: SDL_*.h - * libraries: libSDL2.a libSDL2main.a - -SDL_mixer ---------- -### Prerequisites ### -SDL_mixer depends on the results of SDL to compile. -NEEDS VERIFICATION: Note that the headers must be installed without the "SDL2" prefix directory. -### Download ### -Download SDL2_mixer-devel--mingw.tar.gz. - * Stable: http://www.libsdl.org/projects/SDL_mixer/ - * Mercurial: http://hg.libsdl.org/SDL_mixer/ -### Build ### - sh ./configure && make -### Desired Results ### -Note: With just this bare bones setup all the external libraries and formats will be disabled, but that's OK. - * headers: SDL_mixer.h - * libraries: libSDL2_mixer.a - - -dsound, dxguid, and dxguid_sdl ------------------------------- -### Download ### -See Windows/src/dxlibs. -### Build ### - make -### Desired Results ### - * headers: ddraw.h dinput.h dsound.h (pre-positioned in Windows/include/dx) - * libraries: libdsound.a libdxguid.a libdxguid_sdl.a - - -LuaJIT ------- -### Download ### -Download: LuaJIT-.tar.gz -However, Git HEAD is highly recommended. - * Stable: http://luajit.org/download.html - * Git: git clone http://luajit.org/git/luajit-2.0.git -### Modifications ### - * Modify src/luaconf.h as follows: - * #define LUAI_MAXCSTACK 64000 // (instead of the default 8000.) -### Build ### - make BUILDMODE=static -### Desired Results ### - * headers: lauxlib.h lua.h lua.hpp luaconf.h luajit.h lualib.h - * libraries: libluajit.a - -LPeg ----- -### Download ### -Download: lpeg-.tar.gz - * Stable: http://www.inf.puc-rio.br/~roberto/lpeg -### Modifications ### - * Apply "lpeg-lunatic.patch". -### Build ### - make liblpeg.a -### Desired Results ### - * libraries: liblpeg.a diff --git a/platform/Windows/lib/minipng.dfa b/platform/Windows/lib/minipng.dfa deleted file mode 100755 index 4e4913a48..000000000 --- a/platform/Windows/lib/minipng.dfa +++ /dev/null @@ -1,59 +0,0 @@ -# Minimal LibPNG for EDuke32 -# based on contrib/pngminim/encoder/pngusr.dfa of libpng -# -# Usage: from libpng source root and assuming zlib source in ../zlib, -# make -f scripts/pnglibconf.mak DFA_XTRA=./minipng.dfa CPP="gcc -E" -# make -f scripts/makefile.gcc libpng.a -# -# To clean up: -# make -f scripts/pnglibconf.mak clean -# make -f scripts/makefile.gcc clean -# -# For zlib, the following files are included in the 'mini' archive: -# crc32.o deflate.o adler32.o zutil.o trees.o - -# ========== MODIFIED ORIGINAL FILE FOLLOWS ========== - - -# pngminim/encoder/pngusr.dfa -# -# Copyright (c) 2010-2011 Glenn Randers-Pehrson -# -# This code is released under the libpng license. -# For conditions of distribution and use, see the disclaimer -# and license in png.h - -# First all the build options off: - -everything = off - -# Switch on the write code - this makes a minimalist encoder - -option WRITE on - -# You must choose fixed or floating point arithmetic: - -#option FLOATING_POINT on -option FIXED_POINT on - -# You must chose the internal fixed point implementation or to -# use the system floating point. The latter is considerably -# smaller (by about 1kbyte on an x86 system): - -#option FLOATING_ARITHMETIC on -option FLOATING_ARITHMETIC off - -# Your program will probably need other options. The example -# program here, pnm2pngm, requires the following. Take a look -# at pnglibconf.h to find out the full set of what has to be -# enabled to make the following work. - -option SETJMP on -option USER_MEM on -option WRITE_TEXT on -option STDIO on -option INFO_IMAGE on - -# Custom: - -option WRITE_tRNS on