Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update project configurations

This commit is contained in:
Nomango 2020-04-15 10:12:42 +08:00
parent 2d7beb541e
commit 54b8ab0a4d
15 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/kiwano-audio/kiwano-audio.vcxproj
View File

@ -72,7 +72,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths> <UseFullPaths>false</UseFullPaths>
</ClCompile> </ClCompile>
@ -91,7 +91,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths> <UseFullPaths>false</UseFullPaths>
</ClCompile> </ClCompile>

4
projects/kiwano-imgui/kiwano-imgui.vcxproj
View File

@ -71,7 +71,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths> <UseFullPaths>false</UseFullPaths>
</ClCompile> </ClCompile>
@ -90,7 +90,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths> <UseFullPaths>false</UseFullPaths>
</ClCompile> </ClCompile>

4
projects/kiwano-network/kiwano-network.vcxproj
View File

@ -67,7 +67,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths> <UseFullPaths>false</UseFullPaths>
</ClCompile> </ClCompile>
@ -86,7 +86,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths> <UseFullPaths>false</UseFullPaths>
</ClCompile> </ClCompile>

4
projects/kiwano-physics/kiwano-physics.vcxproj
View File

@ -78,7 +78,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths> <UseFullPaths>false</UseFullPaths>
</ClCompile> </ClCompile>
@ -97,7 +97,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<UseFullPaths>false</UseFullPaths> <UseFullPaths>false</UseFullPaths>
</ClCompile> </ClCompile>

4
projects/kiwano/kiwano.vcxproj
View File

@ -232,7 +232,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<UseFullPaths>false</UseFullPaths> <UseFullPaths>false</UseFullPaths>
</ClCompile> </ClCompile>
<Link> <Link>
@ -251,7 +251,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
<UseFullPaths>false</UseFullPaths> <UseFullPaths>false</UseFullPaths>
</ClCompile> </ClCompile>
<Link> <Link>

14
scripts/coapp/kiwano.autopkg
View File

@ -59,7 +59,7 @@ nuget {
owners: Nomango; owners: Nomango;
licenseUrl: "https://github.com/KiwanoEngine/Kiwano/blob/master/LICENSE"; licenseUrl: "https://github.com/KiwanoEngine/Kiwano/blob/master/LICENSE";
projectUrl: "https://github.com/KiwanoEngine/Kiwano"; projectUrl: "https://github.com/KiwanoEngine/Kiwano";
iconUrl: "https://github.com/KiwanoEngine/Kiwano/raw/master/logo/logo_square.png"; iconUrl: "https://github.com/KiwanoEngine/Kiwano/raw/master/logo/logo.png";
description: A simple game framework for C++; description: A simple game framework for C++;
releaseNotes: "Initial release of a Nuget package for Kiwano Game Engine"; releaseNotes: "Initial release of a Nuget package for Kiwano Game Engine";
copyright: Copyright 2019; copyright: Copyright 2019;
@ -86,17 +86,19 @@ nuget {
files { files {
#defines { #defines {
SRC_ROOT = ..\..\src; SRC_ROOT = ..\..\src;
OUTPUT_DIR = ..\..\projects\output; OUTPUT_DIR = ..\..\projects\output;
} }
include: { include: {
${SRC_ROOT}\**\*.h, ${SRC_ROOT}\kiwano*\**\*.h, ${SRC_ROOT}\kiwano*\**\*.hpp,
${SRC_ROOT}\**\*.hpp ${SRC_ROOT}\3rd-party\**\*.h, ${SRC_ROOT}\3rd-party\**\*.hpp,
}; };
// third patry // third patry
bin: { ${SRC_ROOT}\3rd-party\**\*.dll }; bin: {
${SRC_ROOT}\3rd-party\**\*.dll
};
("v140,v141,v142", "Win32", "Debug") => { ("v140,v141,v142", "Win32", "Debug") => {
[${0},${1},${2}] { [${0},${1},${2}] {

2
src/kiwano-imgui/imgui_impl/imgui_impl_dx10.h
View File

@ -1,7 +1,7 @@
// dear imgui: Renderer for Kiwano (DirectX10) // dear imgui: Renderer for Kiwano (DirectX10)
#pragma once #pragma once
#include <3rd-party/imgui/imgui.h> #include <imgui/imgui.h>
#ifndef KGE_DOXYGEN_DO_NOT_INCLUDE #ifndef KGE_DOXYGEN_DO_NOT_INCLUDE

2
src/kiwano-imgui/imgui_impl/imgui_impl_dx11.h
View File

@ -1,7 +1,7 @@
// dear imgui: Renderer for Kiwano (DirectX11) // dear imgui: Renderer for Kiwano (DirectX11)
#pragma once #pragma once
#include <3rd-party/imgui/imgui.h> #include <imgui/imgui.h>
#ifndef KGE_DOXYGEN_DO_NOT_INCLUDE #ifndef KGE_DOXYGEN_DO_NOT_INCLUDE

2
src/kiwano-imgui/kiwano-imgui.h
View File

@ -24,4 +24,4 @@
#include <kiwano-imgui/ImGuiModule.h> #include <kiwano-imgui/ImGuiModule.h>
// ImGui // ImGui
#include <3rd-party/imgui/imgui.h> #include <imgui/imgui.h>

2
src/kiwano-network/HttpModule.cpp
View File

@ -25,7 +25,7 @@
#include <kiwano-network/HttpRequest.h> #include <kiwano-network/HttpRequest.h>
#include <kiwano-network/HttpResponse.hpp> #include <kiwano-network/HttpResponse.hpp>
#include <kiwano-network/HttpModule.h> #include <kiwano-network/HttpModule.h>
#include <3rd-party/curl/curl.h> // CURL #include <curl/curl.h> // CURL
namespace namespace
{ {

2
src/kiwano-physics/Global.h
View File

@ -22,7 +22,7 @@
#include <kiwano/kiwano.h> #include <kiwano/kiwano.h>
// Box2D // Box2D
#include <3rd-party/Box2D/Box2D.h> #include <Box2D/Box2D.h>
namespace kiwano namespace kiwano
{ {

2
src/kiwano/core/Json.h
View File

@ -20,7 +20,7 @@
#pragma once #pragma once
#include <kiwano/core/Common.h> #include <kiwano/core/Common.h>
#include <3rd-party/nlohmann/json.hpp> #include <nlohmann/json.hpp>
namespace kiwano namespace kiwano
{ {

2
src/kiwano/core/Xml.h
View File

@ -20,7 +20,7 @@
#pragma once #pragma once
#include <kiwano/core/Common.h> #include <kiwano/core/Common.h>
#include <3rd-party/pugixml/pugixml.hpp> #include <pugixml/pugixml.hpp>
namespace kiwano namespace kiwano
{ {

5
src/kiwano/render/DirectX/D3D10DeviceResources.h
View File

@ -37,26 +37,31 @@ public:
KGE_ASSERT(device_); KGE_ASSERT(device_);
return device_.Get(); return device_.Get();
} }
inline ID3D10RenderTargetView* GetRenderTargetView() inline ID3D10RenderTargetView* GetRenderTargetView()
{ {
KGE_ASSERT(rt_view_); KGE_ASSERT(rt_view_);
return rt_view_.Get(); return rt_view_.Get();
} }
inline ID3D10DepthStencilView* GetDepthStencilView() inline ID3D10DepthStencilView* GetDepthStencilView()
{ {
KGE_ASSERT(ds_view_); KGE_ASSERT(ds_view_);
return ds_view_.Get(); return ds_view_.Get();
} }
inline IDXGIFactory* GetDXGIFactory() inline IDXGIFactory* GetDXGIFactory()
{ {
KGE_ASSERT(dxgi_factory_); KGE_ASSERT(dxgi_factory_);
return dxgi_factory_.Get(); return dxgi_factory_.Get();
} }
inline IDXGIDevice* GetDXGIDevice() inline IDXGIDevice* GetDXGIDevice()
{ {
KGE_ASSERT(dxgi_device_); KGE_ASSERT(dxgi_device_);
return dxgi_device_.Get(); return dxgi_device_.Get();
} }
inline IDXGISwapChain* GetDXGISwapChain() inline IDXGISwapChain* GetDXGISwapChain()
{ {
KGE_ASSERT(dxgi_swap_chain_); KGE_ASSERT(dxgi_swap_chain_);

6
src/kiwano/render/DirectX/D3D11DeviceResources.h
View File

@ -37,31 +37,37 @@ public:
KGE_ASSERT(device_); KGE_ASSERT(device_);
return device_.Get(); return device_.Get();
} }
inline ID3D11DeviceContext* GetDeviceContext() inline ID3D11DeviceContext* GetDeviceContext()
{ {
KGE_ASSERT(device_context_); KGE_ASSERT(device_context_);
return device_context_.Get(); return device_context_.Get();
} }
inline ID3D11RenderTargetView* GetRenderTargetView() inline ID3D11RenderTargetView* GetRenderTargetView()
{ {
KGE_ASSERT(rt_view_); KGE_ASSERT(rt_view_);
return rt_view_.Get(); return rt_view_.Get();
} }
inline ID3D11DepthStencilView* GetDepthStencilView() inline ID3D11DepthStencilView* GetDepthStencilView()
{ {
KGE_ASSERT(ds_view_); KGE_ASSERT(ds_view_);
return ds_view_.Get(); return ds_view_.Get();
} }
inline IDXGIFactory* GetDXGIFactory() inline IDXGIFactory* GetDXGIFactory()
{ {
KGE_ASSERT(dxgi_factory_); KGE_ASSERT(dxgi_factory_);
return dxgi_factory_.Get(); return dxgi_factory_.Get();
} }
inline IDXGIDevice* GetDXGIDevice() inline IDXGIDevice* GetDXGIDevice()
{ {
KGE_ASSERT(dxgi_device_); KGE_ASSERT(dxgi_device_);
return dxgi_device_.Get(); return dxgi_device_.Get();
} }
inline IDXGISwapChain* GetDXGISwapChain() inline IDXGISwapChain* GetDXGISwapChain()
{ {
KGE_ASSERT(dxgi_swap_chain_); KGE_ASSERT(dxgi_swap_chain_);