From eefff871a297b50f12cc8328ba7e18285cb9bce9 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Wed, 19 Jan 2011 00:15:12 -0700
Subject: [PATCH] Get build working on Ubuntu

---
 Linux/CodeBlocks/QuakeSpasm.cbp | 146 +++++++++++++++++++++++++++++++-
 OggVorbis/ogg/os_types.h        |  10 ++-
 2 files changed, 150 insertions(+), 6 deletions(-)

diff --git a/Linux/CodeBlocks/QuakeSpasm.cbp b/Linux/CodeBlocks/QuakeSpasm.cbp
index 243216ea..f73f2300 100644
--- a/Linux/CodeBlocks/QuakeSpasm.cbp
+++ b/Linux/CodeBlocks/QuakeSpasm.cbp
@@ -24,6 +24,7 @@
 				<Option parameters="-window -basedir /home/kristian/Desktop/Quake -sndspeed 48000" />
 				<Compiler>
 					<Add option="-O2" />
+					<Add directory="/usr/include/SDL" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -33,11 +34,128 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="`sdl-config --cflags`" />
+			<Add directory="`sdl-config --cflags`" />
 		</Compiler>
 		<Linker>
 			<Add option="`sdl-config --libs`" />
 			<Add option="-lGL" />
 		</Linker>
+		<Unit filename="../../OggVorbis/analysis.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/backends.h" />
+		<Unit filename="../../OggVorbis/bitrate.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/bitrate.h" />
+		<Unit filename="../../OggVorbis/bitwise.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/block.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/books/coupled/res_books_51.h" />
+		<Unit filename="../../OggVorbis/books/coupled/res_books_stereo.h" />
+		<Unit filename="../../OggVorbis/books/floor/floor_books.h" />
+		<Unit filename="../../OggVorbis/books/uncoupled/res_books_uncoupled.h" />
+		<Unit filename="../../OggVorbis/codebook.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/codebook.h" />
+		<Unit filename="../../OggVorbis/codec_internal.h" />
+		<Unit filename="../../OggVorbis/envelope.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/envelope.h" />
+		<Unit filename="../../OggVorbis/floor0.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/floor1.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/framing.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/highlevel.h" />
+		<Unit filename="../../OggVorbis/info.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/lookup.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/lookup.h" />
+		<Unit filename="../../OggVorbis/lookup_data.h" />
+		<Unit filename="../../OggVorbis/lpc.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/lpc.h" />
+		<Unit filename="../../OggVorbis/lsp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/lsp.h" />
+		<Unit filename="../../OggVorbis/mapping0.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/masking.h" />
+		<Unit filename="../../OggVorbis/mdct.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/mdct.h" />
+		<Unit filename="../../OggVorbis/misc.h" />
+		<Unit filename="../../OggVorbis/modes/floor_all.h" />
+		<Unit filename="../../OggVorbis/modes/psych_11.h" />
+		<Unit filename="../../OggVorbis/modes/psych_16.h" />
+		<Unit filename="../../OggVorbis/modes/psych_44.h" />
+		<Unit filename="../../OggVorbis/modes/psych_8.h" />
+		<Unit filename="../../OggVorbis/modes/residue_16.h" />
+		<Unit filename="../../OggVorbis/modes/residue_44.h" />
+		<Unit filename="../../OggVorbis/modes/residue_44p51.h" />
+		<Unit filename="../../OggVorbis/modes/residue_44u.h" />
+		<Unit filename="../../OggVorbis/modes/residue_8.h" />
+		<Unit filename="../../OggVorbis/modes/setup_11.h" />
+		<Unit filename="../../OggVorbis/modes/setup_16.h" />
+		<Unit filename="../../OggVorbis/modes/setup_22.h" />
+		<Unit filename="../../OggVorbis/modes/setup_32.h" />
+		<Unit filename="../../OggVorbis/modes/setup_44.h" />
+		<Unit filename="../../OggVorbis/modes/setup_44p51.h" />
+		<Unit filename="../../OggVorbis/modes/setup_44u.h" />
+		<Unit filename="../../OggVorbis/modes/setup_8.h" />
+		<Unit filename="../../OggVorbis/modes/setup_X.h" />
+		<Unit filename="../../OggVorbis/ogg/ogg.h" />
+		<Unit filename="../../OggVorbis/ogg/os_types.h" />
+		<Unit filename="../../OggVorbis/os.h" />
+		<Unit filename="../../OggVorbis/psy.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/psy.h" />
+		<Unit filename="../../OggVorbis/registry.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/registry.h" />
+		<Unit filename="../../OggVorbis/res0.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/scales.h" />
+		<Unit filename="../../OggVorbis/sharedbook.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/smallft.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/smallft.h" />
+		<Unit filename="../../OggVorbis/synthesis.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/vorbis/codec.h" />
+		<Unit filename="../../OggVorbis/vorbis/vorbisenc.h" />
+		<Unit filename="../../OggVorbis/vorbis/vorbisfile.h" />
+		<Unit filename="../../OggVorbis/vorbisfile.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/window.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../OggVorbis/window.h" />
 		<Unit filename="../../Quake/anorm_dots.h" />
 		<Unit filename="../../Quake/anorms.h" />
 		<Unit filename="../../Quake/arch_def.h" />
@@ -45,6 +163,9 @@
 		<Unit filename="../../Quake/cd_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../../Quake/cd_shared.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../../Quake/cdaudio.h" />
 		<Unit filename="../../Quake/chase.c">
 			<Option compilerVar="CC" />
@@ -164,6 +285,9 @@
 		<Unit filename="../../Quake/menu.h" />
 		<Unit filename="../../Quake/modelgen.h" />
 		<Unit filename="../../Quake/net.h" />
+		<Unit filename="../../Quake/net_bsd.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../../Quake/net_defs.h" />
 		<Unit filename="../../Quake/net_dgrm.c">
 			<Option compilerVar="CC" />
@@ -176,14 +300,11 @@
 		<Unit filename="../../Quake/net_main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="../../Quake/net_bsd.c">
-			<Option compilerVar="CC" />
-		</Unit>
+		<Unit filename="../../Quake/net_sys.h" />
 		<Unit filename="../../Quake/net_udp.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../../Quake/net_udp.h" />
-		<Unit filename="../../Quake/net_sys.h" />
 		<Unit filename="../../Quake/pl_linux.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -221,6 +342,9 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../../Quake/render.h" />
+		<Unit filename="../../Quake/resample.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../../Quake/resource.h" />
 		<Unit filename="../../Quake/sbar.c">
 			<Option compilerVar="CC" />
@@ -228,6 +352,16 @@
 		<Unit filename="../../Quake/sbar.h" />
 		<Unit filename="../../Quake/screen.h" />
 		<Unit filename="../../Quake/server.h" />
+		<Unit filename="../../Quake/snd_codec.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/snd_codec.h" />
+		<Unit filename="../../Quake/snd_codec_ogg.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../../Quake/snd_codec_wav.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../../Quake/snd_dma.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -237,10 +371,14 @@
 		<Unit filename="../../Quake/snd_mix.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../../Quake/snd_resample.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../../Quake/snd_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="../../Quake/sound.h" />
+		<Unit filename="../../Quake/speex_resampler.h" />
 		<Unit filename="../../Quake/spritegn.h" />
 		<Unit filename="../../Quake/sv_main.c">
 			<Option compilerVar="CC" />
diff --git a/OggVorbis/ogg/os_types.h b/OggVorbis/ogg/os_types.h
index d6691b70..d07c2098 100644
--- a/OggVorbis/ogg/os_types.h
+++ b/OggVorbis/ogg/os_types.h
@@ -24,7 +24,7 @@
 #define _ogg_realloc realloc
 #define _ogg_free    free
 
-#if defined(_WIN32) 
+#if defined(_WIN32)
 
 #  if defined(__CYGWIN__)
 #    include <stdint.h>
@@ -140,7 +140,13 @@
 
 #else
 
-#  include <ogg/config_types.h>
+#include <stdint.h>
+typedef int16_t ogg_int16_t;
+typedef uint16_t ogg_uint16_t;
+typedef int32_t ogg_int32_t;
+typedef uint32_t ogg_uint32_t;
+typedef int64_t ogg_int64_t;
+typedef uint64_t ogg_uint64_t;
 
 #endif