diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cf8e74..d875826 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,9 +124,9 @@ set(MAIN_HEADERS src/glstate.h src/quad.h src/tilemap.h - src/flashmap.h + src/tilemap-common.h src/graphics.h - src/debuglogger.h + src/gl-debug.h src/global-ibo.h src/exception.h src/filesystem.h @@ -180,7 +180,7 @@ set(MAIN_SOURCE src/tilemap.cpp src/autotiles.cpp src/graphics.cpp - src/debuglogger.cpp + src/gl-debug.cpp src/etc.cpp src/config.cpp src/settingsmenu.cpp @@ -210,16 +210,21 @@ source_group("MKXP Source" FILES ${MAIN_SOURCE} ${MAIN_HEADERS}) ## Setup embedded source ## set(EMBEDDED_INPUT + shader/common.h shader/transSimple.frag shader/trans.frag shader/hue.frag shader/sprite.frag shader/plane.frag + shader/gray.frag shader/bitmapBlit.frag + shader/flatColor.frag shader/simple.frag shader/simpleColor.frag shader/simpleAlpha.frag + shader/simpleAlphaUni.frag shader/flashMap.frag + shader/minimal.vert shader/simple.vert shader/simpleColor.vert shader/sprite.vert @@ -230,6 +235,7 @@ set(EMBEDDED_INPUT shader/blurV.vert shader/simpleMatrix.vert assets/liberation.ttf + assets/icon.png ) if (RGSS2) diff --git a/README.md b/README.md index f349e5f..9fb46c1 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,10 @@ mkxp is a project that seeks to provide a fully open source implementation of th It is licensed under the GNU General Public License v2+. -[**Prebuilt binaries for Linux (32/64)**](http://ancurio.bplaced.net/mkxp/generic/) -[**Prebuilt binaries for OSX by Ali**](https://app.box.com/mkxpmacbuilds) +## Prebuilt binaries +[**Linux (32bit/64bit)**](http://ancurio.bplaced.net/mkxp/generic/) +[**OSX**](https://app.box.com/mkxpmacbuilds) by Ali +[**Windows (mingw-w64 32bit)**](http://ancurio.bplaced.net/mkxp/mingw32/) ## Bindings Bindings provide the glue code for an interpreted language environment to run game scripts in. Currently there are three bindings: @@ -85,13 +87,11 @@ The syntax is: `--