diff --git a/.gitignore b/.gitignore index b674a7fa..17c3d9fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +# Build folders build/ output/ @@ -5,6 +6,10 @@ x64/ Debug/ Release/ +# Application folders +.vs +.vscode + # vs2010 ipch/ *.opensdf @@ -14,11 +19,11 @@ ipch/ *.user *.lnk -.vs -.vscode - # NuGet packages packages/ !*.dll !*.lib + +# Resources bin +*.aps \ No newline at end of file diff --git a/README.md b/README.md index c045cc3f..f7a81bb9 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,9 @@ # Kiwano Game Engine [![Build status](https://ci.appveyor.com/api/projects/status/frqh09om9ldaklr9/branch/master?svg=true)](https://ci.appveyor.com/project/Nomango/kiwano/branch/master) +[![GitHub release](https://img.shields.io/github/release/nomango/kiwano)](https://github.com/Nomango/Kiwano/releases/latest) +[![GitHub All Releases](https://img.shields.io/github/downloads/nomango/kiwano/total)](https://github.com/Nomango/Kiwano/releases) +[![GitHub license](https://img.shields.io/github/license/nomango/kiwano)](https://github.com/Nomango/Kiwano/blob/master/LICENSE) ## Introduction Kiwano is a open-source 2D C++ game engine, only support win32 platform. diff --git a/appveyor.yml b/appveyor.yml index c6ce6887..a7451f80 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.{build} +version: 0.9.{build} configuration: - Debug - Release diff --git a/logo/icon.ico b/logo/icon.ico new file mode 100644 index 00000000..15806421 Binary files /dev/null and b/logo/icon.ico differ diff --git a/logo/icon_text.ico b/logo/icon_text.ico new file mode 100644 index 00000000..d3c20722 Binary files /dev/null and b/logo/icon_text.ico differ diff --git a/logo/icon_128x128.ico b/logo/icon_text_128x128.ico similarity index 100% rename from logo/icon_128x128.ico rename to logo/icon_text_128x128.ico diff --git a/logo/icon_96x96.ico b/logo/icon_text_96x96.ico similarity index 100% rename from logo/icon_96x96.ico rename to logo/icon_text_96x96.ico diff --git a/samples/Samples/Samples.rc b/samples/Samples/Samples.rc new file mode 100644 index 00000000..ede40d6b Binary files /dev/null and b/samples/Samples/Samples.rc differ diff --git a/samples/Samples/Samples.vcxproj b/samples/Samples/Samples.vcxproj index 28d48970..66a1d59b 100644 --- a/samples/Samples/Samples.vcxproj +++ b/samples/Samples/Samples.vcxproj @@ -112,6 +112,7 @@ + @@ -130,6 +131,12 @@ + + + + + + diff --git a/samples/Samples/Samples.vcxproj.filters b/samples/Samples/Samples.vcxproj.filters index e5f207e6..744661bb 100644 --- a/samples/Samples/Samples.vcxproj.filters +++ b/samples/Samples/Samples.vcxproj.filters @@ -22,16 +22,36 @@ src - - - + + resources + {4460eeec-9e2f-46b6-909a-5ff4443075ce} + + {04b65e7e-f0ce-4b83-a73e-501913daf790} + - + + resources + + + + + resources + + + + + resources + + + + + resources + \ No newline at end of file diff --git a/samples/Samples/main.cpp b/samples/Samples/main.cpp index f515484c..071b1955 100644 --- a/samples/Samples/main.cpp +++ b/samples/Samples/main.cpp @@ -5,6 +5,7 @@ #include "Demo3.h" #include "Demo4.h" #include "Demo5.h" +#include "resource.h" namespace { @@ -40,7 +41,7 @@ public: // 使用 HttpClient 组件 Use(HttpClient::Instance()); - Options options(L"Kiwano示例程序", WINDOW_WIDTH, WINDOW_HEIGHT); + Options options(L"Kiwano示例程序", WINDOW_WIDTH, WINDOW_HEIGHT, MAKEINTRESOURCE(IDI_ICON1)); Init(options); } diff --git a/samples/Samples/resource.h b/samples/Samples/resource.h new file mode 100644 index 00000000..05ca7137 --- /dev/null +++ b/samples/Samples/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ 生成的包含文件。 +// 供 Samples.rc 使用 +// +#define IDI_ICON1 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif