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

minor

This commit is contained in:
Nomango 2019-10-10 15:09:38 +08:00
parent f33a7e8282
commit cbcfc231c6
18 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/3rd-party/StackWalker/libStackWalker.vcxproj vendored
View File

@ -63,7 +63,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/3rd-party;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
@ -81,7 +81,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/3rd-party;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>

4
projects/3rd-party/curl/libcurl.vcxproj vendored
View File

@ -71,7 +71,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/3rd-party;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
@ -89,7 +89,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/3rd-party;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>

4
projects/3rd-party/imgui/libimgui.vcxproj vendored
View File

@ -71,7 +71,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/3rd-party;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
@ -89,7 +89,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/3rd-party;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>

4
projects/3rd-party/tinyxml2/libtinyxml2.vcxproj vendored
View File

@ -63,7 +63,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/3rd-party;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>
@ -81,7 +81,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>None</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/3rd-party;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../../src/3rd-party;</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
<Link>

3
src/kiwano/base/AsyncTask.h
View File

@ -19,10 +19,11 @@
// THE SOFTWARE.
#pragma once
#include "ObjectBase.h"
#include <thread>
#include <mutex>
#include "ObjectBase.h"
namespace kiwano
{
KGE_DECLARE_SMART_PTR(AsyncTask);

3
src/kiwano/base/Logger.cpp
View File

@ -18,10 +18,11 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include "Logger.h"
#include <iostream>
#include <fstream>
#include "Logger.h"
namespace
{
std::streambuf* cin_buffer, * cout_buffer, * cerr_buffer;

5
src/kiwano/base/Logger.h
View File

@ -19,12 +19,13 @@
// THE SOFTWARE.
#pragma once
#include "../macros.h"
#include "../core/core.h"
#include <ctime>
#include <iomanip>
#include <sstream>
#include "../macros.h"
#include "../core/core.h"
#ifndef KGE_LOG
# ifdef KGE_DEBUG
# define KGE_LOG(FORMAT, ...) ::kiwano::Logger::GetInstance()->Messagef((FORMAT ## "\n"), __VA_ARGS__)

2
src/kiwano/base/ObjectBase.cpp
View File

@ -18,9 +18,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <typeinfo>
#include "ObjectBase.h"
#include "Logger.h"
#include <typeinfo>
namespace kiwano
{

3
src/kiwano/base/Resource.cpp
View File

@ -18,10 +18,11 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <iostream>
#include "Resource.h"
#include "../base/Logger.h"
#include <iostream>
namespace kiwano
{
Resource::Resource()

3
src/kiwano/base/Timer.h
View File

@ -19,9 +19,10 @@
// THE SOFTWARE.
#pragma once
#include <functional>
#include "ObjectBase.h"
#include "time.h"
#include <functional>
namespace kiwano
{

5
src/kiwano/base/time.cpp
View File

@ -18,11 +18,12 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include "time.h"
#include "Logger.h"
#include <regex>
#include <unordered_map>
#include "time.h"
#include "Logger.h"
namespace kiwano
{
namespace time

5
src/kiwano/base/time.h
View File

@ -19,11 +19,12 @@
// THE SOFTWARE.
#pragma once
#include "../macros.h"
#include "../core/core.h"
#include <ostream>
#include <istream>
#include "../macros.h"
#include "../core/core.h"
namespace kiwano
{
namespace time

3
src/kiwano/base/win32/ComPtr.hpp
View File

@ -19,9 +19,10 @@
// THE SOFTWARE.
#pragma once
#include <type_traits>
#include "../../core/intrusive_ptr.hpp"
#include <Unknwnbase.h>
#include <type_traits>
namespace kiwano
{

15
src/kiwano/core/core.h
View File

@ -19,6 +19,14 @@
// THE SOFTWARE.
#pragma once
#include <set>
#include <map>
#include <list>
#include <queue>
#include <unordered_set>
#include <unordered_map>
#include <sstream>
#include "vector.hpp"
#include "string.hpp"
#include "intrusive_list.hpp"
@ -27,13 +35,6 @@
#include "singleton.hpp"
#include "function.hpp"
#include "basic_json.hpp"
#include <set>
#include <map>
#include <list>
#include <queue>
#include <unordered_set>
#include <unordered_map>
#include <sstream>
namespace kiwano
{

3
src/kiwano/macros.h
View File

@ -72,9 +72,6 @@
// C++ RunTime Header Files
#include <cassert>
#include <string>
#include <vector>
#include <algorithm>
// Compile-time Config Header File
#include "config.h"

3
src/kiwano/math/Matrix.hpp
View File

@ -19,9 +19,10 @@
// THE SOFTWARE.
#pragma once
#include <algorithm>
#include "Vec2.hpp"
#include "Rect.hpp"
#include <algorithm>
namespace kiwano
{

4
src/kiwano/platform/Application.cpp
View File

@ -18,6 +18,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <mutex>
#include "Application.h"
#include "modules.h"
#include "../base/win32/helper.h"
@ -25,9 +27,9 @@
#include "../base/Director.h"
#include "../renderer/TextureCache.h"
#include "../utils/ResourceCache.h"
#include <windowsx.h> // GET_X_LPARAM, GET_Y_LPARAM
#include <imm.h> // ImmAssociateContext
#include <mutex> // std::mutex
#pragma comment(lib, "imm32.lib")

3
src/kiwano/utils/ResourceCache.cpp
View File

@ -18,13 +18,14 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#include <fstream>
#include "ResourceCache.h"
#include "../base/Logger.h"
#include "../2d/Frame.h"
#include "../2d/FrameSequence.h"
#include "../renderer/GifImage.h"
#include "../renderer/FontCollection.h"
#include <fstream>
namespace kiwano
{