Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion HOWTO-Build (cygwin).txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ or
ARCH=x86_64 make STEAM=1 (for 64bit binaries)

For the Steam version you also need to compile Steamshim launcher. To compile it you need to download steamworks sdk as well.
MSVC project and solution for launcher are included in code/steamshim/launcher
MSVC project and solution for launcher are included in code/thirdparty/steamshim/launcher

Wait for build to complete.

Expand Down
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ endif
BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)-$(BUILD_FLAVOR)
BR=$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH)-$(BUILD_FLAVOR)
STEAMDIR=$(MOUNT_DIR)/steam
STEAMSHIMDIR=$(MOUNT_DIR)/steamshim
STEAMSHIMDIR=$(MOUNT_DIR)/thirdparty/steamshim
CDIR=$(MOUNT_DIR)/client
SDIR=$(MOUNT_DIR)/server
RDIR=$(MOUNT_DIR)/renderer
Expand All @@ -317,22 +317,22 @@ CGDIR=$(MOUNT_DIR)/cgame
BLIBDIR=$(MOUNT_DIR)/botlib
NDIR=$(MOUNT_DIR)/null
UIDIR=$(MOUNT_DIR)/ui
JPDIR=$(MOUNT_DIR)/jpeg-8c
OGGDIR=$(MOUNT_DIR)/libogg-1.3.3
VORBISDIR=$(MOUNT_DIR)/libvorbis-1.3.6
OPUSDIR=$(MOUNT_DIR)/opus-1.2.1
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.9
ZDIR=$(MOUNT_DIR)/zlib-1.2.11
FTDIR=$(MOUNT_DIR)/freetype-2.9
JPDIR=$(MOUNT_DIR)/thirdparty/jpeg-8c
OGGDIR=$(MOUNT_DIR)/thirdparty/libogg-1.3.3
VORBISDIR=$(MOUNT_DIR)/thirdparty/libvorbis-1.3.6
OPUSDIR=$(MOUNT_DIR)/thirdparty/opus-1.2.1
OPUSFILEDIR=$(MOUNT_DIR)/thirdparty/opusfile-0.9
ZDIR=$(MOUNT_DIR)/thirdparty/zlib-1.2.11
FTDIR=$(MOUNT_DIR)/thirdparty/freetype-2.9
SPLDIR=$(MOUNT_DIR)/splines
TOOLSDIR=$(MOUNT_DIR)/tools
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp
Q3LCCETCDIR=$(MOUNT_DIR)/tools/lcc/etc
Q3LCCSRCDIR=$(MOUNT_DIR)/tools/lcc/src
SDLHDIR=$(MOUNT_DIR)/SDL2
LIBSDIR=$(MOUNT_DIR)/libs
SDLHDIR=$(MOUNT_DIR)/thirdparty/SDL2
LIBSDIR=$(MOUNT_DIR)/thirdparty/libs
BSPCDIR=$(MOUNT_DIR)/../sdk/rtcw-bspc-custom/src/bspc
BSPCBLIBDIR=$(MOUNT_DIR)/../sdk/rtcw-bspc-custom/src/botlib
BSPCCMDIR=$(MOUNT_DIR)/../sdk/rtcw-bspc-custom/src/qcommon
Expand Down
4 changes: 2 additions & 2 deletions code/client/client.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ If you have questions concerning this license or the applicable additional terms

#ifdef USE_VOIP
#ifdef USE_LOCAL_HEADERS
#include "../opus-1.2.1/include/opus.h"
#include "../opusfile-0.9/include/opusfile.h"
#include "../thirdparty/opus-1.2.1/include/opus.h"
#include "../thirdparty/opusfile-0.9/include/opusfile.h"
#else
#include <opus/opus.h>
#include <opus/opusfile.h>
Expand Down
4 changes: 2 additions & 2 deletions code/client/qal.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#endif

#ifdef USE_LOCAL_HEADERS
#include "../AL/al.h"
#include "../AL/alc.h"
#include "../thirdparty/AL/al.h"
#include "../thirdparty/AL/alc.h"
#else
#ifdef _MSC_VER
// MSVC users must install the OpenAL SDK which doesn't use the AL/*.h scheme.
Expand Down
2 changes: 1 addition & 1 deletion code/client/snd_codec_ogg.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <errno.h>
#define OV_EXCLUDE_STATIC_CALLBACKS
#ifdef USE_LOCAL_HEADERS
#include "../libvorbis-1.3.6/include/vorbis/vorbisfile.h"
#include "../thirdparty/libvorbis-1.3.6/include/vorbis/vorbisfile.h"
#else
#include <vorbis/vorbisfile.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion code/qcommon/files.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ If you have questions concerning this license or the applicable additional terms

#include "q_shared.h"
#include "qcommon.h"
#include "../zlib-1.2.11/unzip.h"
#include "../thirdparty/zlib-1.2.11/unzip.h"

/*
=============================================================================
Expand Down
2 changes: 1 addition & 1 deletion code/renderer/tr_font.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ If you have questions concerning this license or the applicable additional terms

#ifdef BUILD_FREETYPE
#ifdef USE_LOCAL_HEADERS
#include "../freetype-2.9/include/ft2build.h"
#include "../thirdparty/freetype-2.9/include/ft2build.h"
#else
#include <ft2build.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion code/steam/steam.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "steam.h"

#include "../steamshim/steamshim_child.h"
#include "../thirdparty/steamshim/steamshim_child.h"

#include <stdint.h>

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading