From b4d8e9c17b92e3065c7c990f9b96c1c651aff93a Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 3 Mar 2021 06:21:25 -0800 Subject: [PATCH] Make compilation process compatible to linux on gcc --- premake5.lua | 9 ++ src/ObjCommon/Image/DxgiFormat.h | 145 ++++++++++++++++++ src/ObjCommon/Image/ImageFormat.h | 2 +- src/Utils.lua | 14 +- src/Utils/Utils/ClassUtils.h | 2 + src/Utils/Utils/MemoryManager.cpp | 7 +- src/ZoneCode.lua | 10 +- src/ZoneCodeGenerator.lua | 2 +- src/ZoneCodeGeneratorLib.lua | 2 + .../Domain/Definition/BaseTypeDefinition.cpp | 4 +- .../Matcher/CommandsCommonMatchers.cpp | 3 +- .../Commands/Sequence/SequenceReorder.cpp | 2 + .../Header/Matcher/HeaderCommonMatchers.cpp | 3 +- .../Parsing/IParserLineStream.h | 1 + .../Parsing/ParsingException.cpp | 2 +- .../Parsing/ParsingException.h | 2 +- src/ZoneCodeGeneratorLib/Parsing/TokenPos.h | 1 + .../Utils/NamespaceBuilder.h | 1 + .../ZoneCodeGeneratorArguments.cpp | 3 +- src/ZoneCommon/Game/IW4/IW4.h | 2 +- src/ZoneCommon/Game/IW4/IW4_Assets.h | 12 ++ src/ZoneCommon/Game/T6/T6.h | 2 +- src/ZoneCommon/Pool/AssetPool.h | 2 +- 23 files changed, 210 insertions(+), 23 deletions(-) create mode 100644 src/ObjCommon/Image/DxgiFormat.h diff --git a/premake5.lua b/premake5.lua index f7118fc6..5b07a78c 100644 --- a/premake5.lua +++ b/premake5.lua @@ -55,6 +55,15 @@ TargetDirectoryBin = "%{wks.location}/bin/%{cfg.buildcfg}_%{cfg.platform}" TargetDirectoryLib = "%{wks.location}/lib/%{cfg.buildcfg}_%{cfg.platform}" TargetDirectoryTest = "%{wks.location}/lib/%{cfg.buildcfg}_%{cfg.platform}/tests" +-- Platform functions +function ExecutableByOs(name) + if os.host() == "windows" then + return name .. ".exe" + else + return name + end +end + -- ================== -- Workspace -- ================== diff --git a/src/ObjCommon/Image/DxgiFormat.h b/src/ObjCommon/Image/DxgiFormat.h new file mode 100644 index 00000000..1f28051f --- /dev/null +++ b/src/ObjCommon/Image/DxgiFormat.h @@ -0,0 +1,145 @@ +/* + * Copyright 2016 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +const unsigned int DXGI_FORMAT_DEFINED = 1; + +typedef enum DXGI_FORMAT +{ + DXGI_FORMAT_UNKNOWN = 0x00, + DXGI_FORMAT_R32G32B32A32_TYPELESS = 0x01, + DXGI_FORMAT_R32G32B32A32_FLOAT = 0x02, + DXGI_FORMAT_R32G32B32A32_UINT = 0x03, + DXGI_FORMAT_R32G32B32A32_SINT = 0x04, + DXGI_FORMAT_R32G32B32_TYPELESS = 0x05, + DXGI_FORMAT_R32G32B32_FLOAT = 0x06, + DXGI_FORMAT_R32G32B32_UINT = 0x07, + DXGI_FORMAT_R32G32B32_SINT = 0x08, + DXGI_FORMAT_R16G16B16A16_TYPELESS = 0x09, + DXGI_FORMAT_R16G16B16A16_FLOAT = 0x0a, + DXGI_FORMAT_R16G16B16A16_UNORM = 0x0b, + DXGI_FORMAT_R16G16B16A16_UINT = 0x0c, + DXGI_FORMAT_R16G16B16A16_SNORM = 0x0d, + DXGI_FORMAT_R16G16B16A16_SINT = 0x0e, + DXGI_FORMAT_R32G32_TYPELESS = 0x0f, + DXGI_FORMAT_R32G32_FLOAT = 0x10, + DXGI_FORMAT_R32G32_UINT = 0x11, + DXGI_FORMAT_R32G32_SINT = 0x12, + DXGI_FORMAT_R32G8X24_TYPELESS = 0x13, + DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 0x14, + DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS = 0x15, + DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 0x16, + DXGI_FORMAT_R10G10B10A2_TYPELESS = 0x17, + DXGI_FORMAT_R10G10B10A2_UNORM = 0x18, + DXGI_FORMAT_R10G10B10A2_UINT = 0x19, + DXGI_FORMAT_R11G11B10_FLOAT = 0x1a, + DXGI_FORMAT_R8G8B8A8_TYPELESS = 0x1b, + DXGI_FORMAT_R8G8B8A8_UNORM = 0x1c, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 0x1d, + DXGI_FORMAT_R8G8B8A8_UINT = 0x1e, + DXGI_FORMAT_R8G8B8A8_SNORM = 0x1f, + DXGI_FORMAT_R8G8B8A8_SINT = 0x20, + DXGI_FORMAT_R16G16_TYPELESS = 0x21, + DXGI_FORMAT_R16G16_FLOAT = 0x22, + DXGI_FORMAT_R16G16_UNORM = 0x23, + DXGI_FORMAT_R16G16_UINT = 0x24, + DXGI_FORMAT_R16G16_SNORM = 0x25, + DXGI_FORMAT_R16G16_SINT = 0x26, + DXGI_FORMAT_R32_TYPELESS = 0x27, + DXGI_FORMAT_D32_FLOAT = 0x28, + DXGI_FORMAT_R32_FLOAT = 0x29, + DXGI_FORMAT_R32_UINT = 0x2a, + DXGI_FORMAT_R32_SINT = 0x2b, + DXGI_FORMAT_R24G8_TYPELESS = 0x2c, + DXGI_FORMAT_D24_UNORM_S8_UINT = 0x2d, + DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 0x2e, + DXGI_FORMAT_X24_TYPELESS_G8_UINT = 0x2f, + DXGI_FORMAT_R8G8_TYPELESS = 0x30, + DXGI_FORMAT_R8G8_UNORM = 0x31, + DXGI_FORMAT_R8G8_UINT = 0x32, + DXGI_FORMAT_R8G8_SNORM = 0x33, + DXGI_FORMAT_R8G8_SINT = 0x34, + DXGI_FORMAT_R16_TYPELESS = 0x35, + DXGI_FORMAT_R16_FLOAT = 0x36, + DXGI_FORMAT_D16_UNORM = 0x37, + DXGI_FORMAT_R16_UNORM = 0x38, + DXGI_FORMAT_R16_UINT = 0x39, + DXGI_FORMAT_R16_SNORM = 0x3a, + DXGI_FORMAT_R16_SINT = 0x3b, + DXGI_FORMAT_R8_TYPELESS = 0x3c, + DXGI_FORMAT_R8_UNORM = 0x3d, + DXGI_FORMAT_R8_UINT = 0x3e, + DXGI_FORMAT_R8_SNORM = 0x3f, + DXGI_FORMAT_R8_SINT = 0x40, + DXGI_FORMAT_A8_UNORM = 0x41, + DXGI_FORMAT_R1_UNORM = 0x42, + DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 0x43, + DXGI_FORMAT_R8G8_B8G8_UNORM = 0x44, + DXGI_FORMAT_G8R8_G8B8_UNORM = 0x45, + DXGI_FORMAT_BC1_TYPELESS = 0x46, + DXGI_FORMAT_BC1_UNORM = 0x47, + DXGI_FORMAT_BC1_UNORM_SRGB = 0x48, + DXGI_FORMAT_BC2_TYPELESS = 0x49, + DXGI_FORMAT_BC2_UNORM = 0x4a, + DXGI_FORMAT_BC2_UNORM_SRGB = 0x4b, + DXGI_FORMAT_BC3_TYPELESS = 0x4c, + DXGI_FORMAT_BC3_UNORM = 0x4d, + DXGI_FORMAT_BC3_UNORM_SRGB = 0x4e, + DXGI_FORMAT_BC4_TYPELESS = 0x4f, + DXGI_FORMAT_BC4_UNORM = 0x50, + DXGI_FORMAT_BC4_SNORM = 0x51, + DXGI_FORMAT_BC5_TYPELESS = 0x52, + DXGI_FORMAT_BC5_UNORM = 0x53, + DXGI_FORMAT_BC5_SNORM = 0x54, + DXGI_FORMAT_B5G6R5_UNORM = 0x55, + DXGI_FORMAT_B5G5R5A1_UNORM = 0x56, + DXGI_FORMAT_B8G8R8A8_UNORM = 0x57, + DXGI_FORMAT_B8G8R8X8_UNORM = 0x58, + DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 0x59, + DXGI_FORMAT_B8G8R8A8_TYPELESS = 0x5a, + DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 0x5b, + DXGI_FORMAT_B8G8R8X8_TYPELESS = 0x5c, + DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 0x5d, + DXGI_FORMAT_BC6H_TYPELESS = 0x5e, + DXGI_FORMAT_BC6H_UF16 = 0x5f, + DXGI_FORMAT_BC6H_SF16 = 0x60, + DXGI_FORMAT_BC7_TYPELESS = 0x61, + DXGI_FORMAT_BC7_UNORM = 0x62, + DXGI_FORMAT_BC7_UNORM_SRGB = 0x63, + DXGI_FORMAT_AYUV = 0x64, + DXGI_FORMAT_Y410 = 0x65, + DXGI_FORMAT_Y416 = 0x66, + DXGI_FORMAT_NV12 = 0x67, + DXGI_FORMAT_P010 = 0x68, + DXGI_FORMAT_P016 = 0x69, + DXGI_FORMAT_420_OPAQUE = 0x6a, + DXGI_FORMAT_YUY2 = 0x6b, + DXGI_FORMAT_Y210 = 0x6c, + DXGI_FORMAT_Y216 = 0x6d, + DXGI_FORMAT_NV11 = 0x6e, + DXGI_FORMAT_AI44 = 0x6f, + DXGI_FORMAT_IA44 = 0x70, + DXGI_FORMAT_P8 = 0x71, + DXGI_FORMAT_A8P8 = 0x72, + DXGI_FORMAT_B4G4R4A4_UNORM = 0x73, + + DXGI_FORMAT_P208 = 0x82, + DXGI_FORMAT_V208 = 0x83, + DXGI_FORMAT_V408 = 0x84, + + DXGI_FORMAT_FORCE_UINT = 0xffffffff, +} DXGI_FORMAT; \ No newline at end of file diff --git a/src/ObjCommon/Image/ImageFormat.h b/src/ObjCommon/Image/ImageFormat.h index bedc6bde..05501f79 100644 --- a/src/ObjCommon/Image/ImageFormat.h +++ b/src/ObjCommon/Image/ImageFormat.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include "DxgiFormat.h" enum class ImageFormatId { diff --git a/src/Utils.lua b/src/Utils.lua index a0ac964b..91ad56bc 100644 --- a/src/Utils.lua +++ b/src/Utils.lua @@ -1,7 +1,7 @@ Utils = {} function Utils:include() - if References:include("Utils") then + if References:include(self:name()) then includedirs { path.join(ProjectFolder(), "Utils") } @@ -9,8 +9,8 @@ function Utils:include() end function Utils:link() - if References:link("Utils") then - links "Utils" + if References:link(self:name()) then + links(self:name()) end end @@ -18,12 +18,16 @@ function Utils:use() end +function Utils:name() + return "Utils" +end + function Utils:project() References:reset() local folder = ProjectFolder(); - project "Utils" - targetdir(TargetDirectoryLib) + project(self:name()) + targetdir(TargetDirectoryLib) location "%{wks.location}/src/%{prj.name}" kind "StaticLib" language "C++" diff --git a/src/Utils/Utils/ClassUtils.h b/src/Utils/Utils/ClassUtils.h index f8792858..4216d4a0 100644 --- a/src/Utils/Utils/ClassUtils.h +++ b/src/Utils/Utils/ClassUtils.h @@ -1,5 +1,7 @@ #pragma once +#include + #define STR(x) #x #if defined(_MSVC_LANG) diff --git a/src/Utils/Utils/MemoryManager.cpp b/src/Utils/Utils/MemoryManager.cpp index 802564c0..1a79ad40 100644 --- a/src/Utils/Utils/MemoryManager.cpp +++ b/src/Utils/Utils/MemoryManager.cpp @@ -1,5 +1,8 @@ #include "MemoryManager.h" +#include +#include + MemoryManager::AllocationInfo::AllocationInfo(IDestructible* data, void* dataPtr) { m_data = data; @@ -34,7 +37,7 @@ void* MemoryManager::Alloc(const size_t size) char* MemoryManager::Dup(const char* str) { - char* result = _strdup(str); + char* result = strdup(str); m_allocations.push_back(result); return result; @@ -51,4 +54,4 @@ void MemoryManager::Delete(void* data) return; } } -} \ No newline at end of file +} diff --git a/src/ZoneCode.lua b/src/ZoneCode.lua index 80628e69..2698bb5c 100644 --- a/src/ZoneCode.lua +++ b/src/ZoneCode.lua @@ -188,19 +188,19 @@ function ZoneCode:project() filter "files:**.gen" buildmessage "Generating ZoneCode for game %{file.basename}" buildcommands { - '"' .. TargetDirectoryBin .. '/ZoneCodeGenerator.exe"' + '"' .. TargetDirectoryBin .. '/' .. ExecutableByOs('ZoneCodeGenerator') .. '"' .. ' -h "' .. path.join(path.getabsolute(ProjectFolder()), 'ZoneCode/Game/%{file.basename}/%{file.basename}.h') .. '"' .. ' -c "' .. path.join(path.getabsolute(ProjectFolder()), 'ZoneCode/Game/%{file.basename}/%{file.basename}_Commands.txt') .. '"' .. ' -o "%{wks.location}/src/ZoneCode/Game/%{file.basename}/XAssets"' - .. ' -g * ZoneLoad' - .. ' -g * ZoneWrite' - .. ' -g * AssetStructTests' + .. ' -g "*" ZoneLoad' + .. ' -g "*" ZoneWrite' + .. ' -g "*" AssetStructTests' } buildinputs { path.join(ProjectFolder(), "ZoneCode/Game/%{file.basename}/%{file.basename}.h"), path.join(ProjectFolder(), "ZoneCode/Game/%{file.basename}/%{file.basename}_Commands.txt"), path.join(ProjectFolder(), "ZoneCommon/Game/%{file.basename}/%{file.basename}_Assets.h"), - TargetDirectoryBin .. "/ZoneCodeGenerator.exe" + TargetDirectoryBin .. "/" .. ExecutableByOs('ZoneCodeGenerator') } filter {} diff --git a/src/ZoneCodeGenerator.lua b/src/ZoneCodeGenerator.lua index c847b691..32f76458 100644 --- a/src/ZoneCodeGenerator.lua +++ b/src/ZoneCodeGenerator.lua @@ -46,6 +46,6 @@ function ZoneCodeGenerator:project() self:include() ZoneCodeGeneratorLib:include() - Utils:link() ZoneCodeGeneratorLib:link() + Utils:link() end diff --git a/src/ZoneCodeGeneratorLib.lua b/src/ZoneCodeGeneratorLib.lua index e1ed4f92..4a1b4eb0 100644 --- a/src/ZoneCodeGeneratorLib.lua +++ b/src/ZoneCodeGeneratorLib.lua @@ -40,4 +40,6 @@ function ZoneCodeGeneratorLib:project() } self:include() + + Utils:link() end diff --git a/src/ZoneCodeGeneratorLib/Domain/Definition/BaseTypeDefinition.cpp b/src/ZoneCodeGeneratorLib/Domain/Definition/BaseTypeDefinition.cpp index 5450dfbd..47716c05 100644 --- a/src/ZoneCodeGeneratorLib/Domain/Definition/BaseTypeDefinition.cpp +++ b/src/ZoneCodeGeneratorLib/Domain/Definition/BaseTypeDefinition.cpp @@ -1,5 +1,7 @@ #include "BaseTypeDefinition.h" +#include + BaseTypeDefinition::BaseTypeDefinition(std::string name, const unsigned size) : DataDefinition("", std::move(name)), m_size(size) @@ -57,4 +59,4 @@ const BaseTypeDefinition* const BaseTypeDefinition::ALL_BASE_TYPES[] UNSIGNED_LONG_LONG, VOID }; -const size_t BaseTypeDefinition::ALL_BASE_TYPES_COUNT = _countof(ALL_BASE_TYPES); \ No newline at end of file +const size_t BaseTypeDefinition::ALL_BASE_TYPES_COUNT = std::extent::value; \ No newline at end of file diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/Matcher/CommandsCommonMatchers.cpp b/src/ZoneCodeGeneratorLib/Parsing/Commands/Matcher/CommandsCommonMatchers.cpp index 3266be2f..c1cebeae 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Commands/Matcher/CommandsCommonMatchers.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/Commands/Matcher/CommandsCommonMatchers.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include "CommandsMatcherFactory.h" #include "Domain/Evaluation/OperandDynamic.h" @@ -19,7 +20,7 @@ std::unique_ptr CommandsCommonMatchers::Typen "int", "long" }; - static_assert(_countof(BUILT_IN_TYPE_NAMES) == static_cast(CommandsParserValueType::BUILT_IN_LAST) - static_cast(CommandsParserValueType::BUILT_IN_FIRST) + 1); + static_assert(std::extent::value == static_cast(CommandsParserValueType::BUILT_IN_LAST) - static_cast(CommandsParserValueType::BUILT_IN_FIRST) + 1); const CommandsMatcherFactory create(labelSupplier); diff --git a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceReorder.cpp b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceReorder.cpp index d69e9d4d..b93e63e3 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceReorder.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/Commands/Sequence/SequenceReorder.cpp @@ -1,5 +1,7 @@ #include "SequenceReorder.h" +#include + #include "Parsing/Commands/Matcher/CommandsMatcherFactory.h" #include "Parsing/Commands/Matcher/CommandsCommonMatchers.h" diff --git a/src/ZoneCodeGeneratorLib/Parsing/Header/Matcher/HeaderCommonMatchers.cpp b/src/ZoneCodeGeneratorLib/Parsing/Header/Matcher/HeaderCommonMatchers.cpp index ba056954..a0d07b84 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/Header/Matcher/HeaderCommonMatchers.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/Header/Matcher/HeaderCommonMatchers.cpp @@ -1,6 +1,7 @@ #include "HeaderCommonMatchers.h" #include +#include #include "HeaderMatcherFactory.h" @@ -52,7 +53,7 @@ std::unique_ptr HeaderCommonMatchers::Typename( "int", "long" }; - static_assert(_countof(BUILT_IN_TYPE_NAMES) == static_cast(HeaderParserValueType::BUILT_IN_LAST) - static_cast(HeaderParserValueType::BUILT_IN_FIRST) + 1); + static_assert(std::extent::value == static_cast(HeaderParserValueType::BUILT_IN_LAST) - static_cast(HeaderParserValueType::BUILT_IN_FIRST) + 1); const HeaderMatcherFactory create(labelSupplier); diff --git a/src/ZoneCodeGeneratorLib/Parsing/IParserLineStream.h b/src/ZoneCodeGeneratorLib/Parsing/IParserLineStream.h index b53c4cba..87a968aa 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/IParserLineStream.h +++ b/src/ZoneCodeGeneratorLib/Parsing/IParserLineStream.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include "Utils/ClassUtils.h" diff --git a/src/ZoneCodeGeneratorLib/Parsing/ParsingException.cpp b/src/ZoneCodeGeneratorLib/Parsing/ParsingException.cpp index f48f6bf7..eeab8ab7 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/ParsingException.cpp +++ b/src/ZoneCodeGeneratorLib/Parsing/ParsingException.cpp @@ -26,7 +26,7 @@ std::string ParsingException::FullMessage() const return m_full_message; } -char const* ParsingException::what() const +char const* ParsingException::what() const noexcept { return m_full_message.c_str(); } diff --git a/src/ZoneCodeGeneratorLib/Parsing/ParsingException.h b/src/ZoneCodeGeneratorLib/Parsing/ParsingException.h index de0681d1..400b9234 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/ParsingException.h +++ b/src/ZoneCodeGeneratorLib/Parsing/ParsingException.h @@ -18,5 +18,5 @@ public: _NODISCARD TokenPos Position() const; _NODISCARD const std::string& Message() const; _NODISCARD std::string FullMessage() const; - _NODISCARD char const* what() const override; + _NODISCARD char const* what() const noexcept override; }; diff --git a/src/ZoneCodeGeneratorLib/Parsing/TokenPos.h b/src/ZoneCodeGeneratorLib/Parsing/TokenPos.h index cf513580..6035cc98 100644 --- a/src/ZoneCodeGeneratorLib/Parsing/TokenPos.h +++ b/src/ZoneCodeGeneratorLib/Parsing/TokenPos.h @@ -1,6 +1,7 @@ #pragma once #include +#include class TokenPos { diff --git a/src/ZoneCodeGeneratorLib/Utils/NamespaceBuilder.h b/src/ZoneCodeGeneratorLib/Utils/NamespaceBuilder.h index 51e83c94..f64863fe 100644 --- a/src/ZoneCodeGeneratorLib/Utils/NamespaceBuilder.h +++ b/src/ZoneCodeGeneratorLib/Utils/NamespaceBuilder.h @@ -1,5 +1,6 @@ #pragma once +#include "Utils/ClassUtils.h" #include #include diff --git a/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp b/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp index ccf778ef..675184c4 100644 --- a/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp +++ b/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp @@ -1,6 +1,7 @@ #include "ZoneCodeGeneratorArguments.h" #include +#include #include "Utils/Arguments/CommandLineOption.h" #include "Utils/Arguments/UsageInformation.h" @@ -103,7 +104,7 @@ ZoneCodeGeneratorArguments::GenerationTask::GenerationTask(std::string assetName } ZoneCodeGeneratorArguments::ZoneCodeGeneratorArguments() - : m_argument_parser(COMMAND_LINE_OPTIONS, _countof(COMMAND_LINE_OPTIONS)), + : m_argument_parser(COMMAND_LINE_OPTIONS, std::extent::value), m_task_flags(0) { m_verbose = false; diff --git a/src/ZoneCommon/Game/IW4/IW4.h b/src/ZoneCommon/Game/IW4/IW4.h index 8fcb0b9d..eaf14151 100644 --- a/src/ZoneCommon/Game/IW4/IW4.h +++ b/src/ZoneCommon/Game/IW4/IW4.h @@ -1,6 +1,6 @@ #pragma once -#include +//#include #include "Image/Texture.h" #include "IW4_Assets.h" diff --git a/src/ZoneCommon/Game/IW4/IW4_Assets.h b/src/ZoneCommon/Game/IW4/IW4_Assets.h index b45b5db8..54d9fbaa 100644 --- a/src/ZoneCommon/Game/IW4/IW4_Assets.h +++ b/src/ZoneCommon/Game/IW4/IW4_Assets.h @@ -3,6 +3,18 @@ #ifndef __IW4_ASSETS_H #define __IW4_ASSETS_H +#ifndef __align +#ifdef __zonecodegenerator +#define __align alignas +#else +#if defined(_MSVC_LANG) +#define __align(x) __declspec(align(x)) +#else +#define __align(x) alignas(x) +#endif +#endif +#endif + #ifndef __zonecodegenerator namespace IW4 { diff --git a/src/ZoneCommon/Game/T6/T6.h b/src/ZoneCommon/Game/T6/T6.h index 219d4105..a2af125d 100644 --- a/src/ZoneCommon/Game/T6/T6.h +++ b/src/ZoneCommon/Game/T6/T6.h @@ -1,6 +1,6 @@ #pragma once -#include +//#include #include "Image/Texture.h" #include "T6_Assets.h" diff --git a/src/ZoneCommon/Pool/AssetPool.h b/src/ZoneCommon/Pool/AssetPool.h index c1e5f0e0..1d826739 100644 --- a/src/ZoneCommon/Pool/AssetPool.h +++ b/src/ZoneCommon/Pool/AssetPool.h @@ -4,7 +4,7 @@ #include #include "XAssetInfo.h" -#include "zone/Zone.h" +#include "Zone/Zone.h" class Zone;