Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions codxe.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
<ObjectFileName>$(IntDir)$(ProjectName)\%(RelativeDir)</ObjectFileName>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(ProjectDir)src</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName)\pch.pch</PrecompiledHeaderOutputFile>
<!-- Disable warning C4481: nonstandard extension used: override specifier 'override'
This allows use of the C++11 'override' keyword with the Xbox 360 compiler (pre-C++11) -->
<AdditionalOptions>/wd4481 %(AdditionalOptions)</AdditionalOptions>
Expand All @@ -58,7 +61,6 @@
<ProgramDatabaseFile Condition="'$(Configuration)'=='Debug'">$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
<OptimizeReferences Condition="'$(Configuration)'=='Release'">true</OptimizeReferences>
<SetChecksum Condition="'$(Configuration)'=='Release'">true</SetChecksum>
<AdditionalDependencies>d3d9ltcg.lib;xgraphics.lib;xjson.lib</AdditionalDependencies>
<AdditionalOptions>/DLL /ENTRY:"_DllMainCRTStartup" /ALIGN:128,4096 %(AdditionalOptions)</AdditionalOptions>
</Link>
<Deploy>
Expand All @@ -71,6 +73,11 @@
</ImageXex>
</ItemDefinitionGroup>
<ItemGroup>
<!-- Precompiled header -->
<ClCompile Include="src\pch.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>

<ClCompile Include="src\common\config.cpp" />

<ClCompile Include="src\game\iw2\sp\components\scr_parser.cpp" />
Expand Down Expand Up @@ -160,6 +167,9 @@
<ClCompile Include="src\xbox360.cpp" />
</ItemGroup>
<ItemGroup>
<!-- Precompiled header -->
<ClInclude Include="src\pch.h" />

<ClInclude Include="src\common\branding.h" />
<ClInclude Include="src\common\config.h" />

Expand Down Expand Up @@ -254,4 +264,4 @@
<ClInclude Include="src\plugin.h" />
<ClInclude Include="src\xbox360.h" />
</ItemGroup>
</Project>
</Project>
1 change: 1 addition & 0 deletions src/common/config.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "pch.h"
#include "config.h"

#ifndef INVALID_FILE_ATTRIBUTES
Expand Down
2 changes: 1 addition & 1 deletion src/common/config.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

extern const char *CONFIG_PATH;
extern const char *MOD_DIR;
Expand Down
1 change: 1 addition & 0 deletions src/detour.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "pch.h"
#include "detour.h"

#pragma section(".text")
Expand Down
2 changes: 1 addition & 1 deletion src/dllmain.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "common.h"
#include "pch.h"
#include "plugin_manager.h"

PluginManager *g_plugin_manager = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion src/filesystem.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "common.h"
#include "pch.h"

#ifndef INVALID_FILE_ATTRIBUTES
#define INVALID_FILE_ATTRIBUTES ((DWORD) - 1)
Expand Down
2 changes: 1 addition & 1 deletion src/filesystem.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace filesystem
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw2/mp/components/scr_parser.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "scr_parser.h"
#include "common.h"

namespace iw2
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw2/mp/components/scr_parser.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw2
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw2/mp/main.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "pch.h"
#include "components/scr_parser.h"
#include "main.h"
#include "common.h"

namespace iw2
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw2/sp/components/scr_parser.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "scr_parser.h"
#include "common.h"

namespace iw2
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw2/sp/components/scr_parser.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw2
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw2/sp/main.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "pch.h"
#include "components/scr_parser.h"
#include "main.h"
#include "common.h"

namespace iw2
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/cg.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "pch.h"
#include "cg.h"
#include "cj_tas.h"
#include "common.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/cg.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
3 changes: 1 addition & 2 deletions src/game/iw3/mp/components/cj_tas.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "pch.h"
#include "cj_tas.h"
#include "common.h"
#include <algorithm>

#define ANGLE2SHORT(x) ((int)((x) * 65536 / 360) & 65535)
#define SHORT2ANGLE(x) ((x) * (360.0 / 65536))
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/cj_tas.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/clipmap.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "clipmap.h"
#include "common.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/clipmap.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/cmds.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "cmds.h"
#include "common.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/cmds.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/g_client_fields.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "g_client_fields.h"
#include "common.h"

const unsigned int CLIENT_FIELD_MASK = 0xC000;

Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/g_client_fields.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/g_scr_main.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "g_scr_main.h"
#include "common.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/g_scr_main.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/pm.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "pm.h"
#include "common.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/pm.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/scr_parser.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "scr_parser.h"
#include "common.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/scr_parser.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/scr_vm_functions.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "scr_vm_functions.h"
#include "common.h"
#include "g_scr_main.h"

namespace iw3
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/components/scr_vm_functions.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
1 change: 1 addition & 0 deletions src/game/iw3/mp/main.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "pch.h"
#include "main.h"
#include "components/cg.h"
#include "components/cj_tas.h"
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/main.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/mp/structs.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

#pragma warning(disable : 4480)

Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/sp/components/scr_parser.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "scr_parser.h"
#include "common.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/sp/components/scr_parser.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw3
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw3/sp/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "common.h"
#include "pch.h"
#include "components/scr_parser.h"

namespace
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw4/mp/components/cg.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "cg.h"
#include "common.h"

namespace iw4
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw4/mp/components/cg.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw4
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw4/mp/components/clipmap.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "clipmap.h"
#include "common.h"
#include "g_scr_main.h"
#include "events.h"

Expand Down
2 changes: 1 addition & 1 deletion src/game/iw4/mp/components/clipmap.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

class clipmap : public Module
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw4/mp/components/console.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "console.h"
#include "common.h"

typedef void (*R_AddCmdDrawStretchPic_t)(float x, float y, float w, float h, float s0, float t0, float s1, float t1,
const float *color, iw4::mp::Material *material);
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw4/mp/components/console.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

class Console : public Module
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw4/mp/components/events.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "events.h"
#include "common.h"

std::vector<std::function<void()>> Events::cg_drawactive_callbacks;

Expand Down
2 changes: 1 addition & 1 deletion src/game/iw4/mp/components/events.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

class Events : public Module
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw4/mp/components/g_client_fields.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "pch.h"
#include "g_client_fields.h"
#include "common.h"

namespace iw4
{
Expand Down
2 changes: 1 addition & 1 deletion src/game/iw4/mp/components/g_client_fields.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "common.h"
#include "pch.h"

namespace iw4
{
Expand Down
3 changes: 1 addition & 2 deletions src/game/iw4/mp/components/g_scr_main.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "pch.h"
#include "g_scr_main.h"
#include "common.h"
#include <cstdio>

namespace iw4
{
Expand Down
Loading