From f1f95b16304f88bc57fb3ac7e3517faa0f984df8 Mon Sep 17 00:00:00 2001 From: Vinyl Darkscratch Date: Wed, 3 Oct 2018 05:51:48 -0700 Subject: [PATCH 1/2] Update crash message --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index f60552c..bebb63d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -376,7 +376,7 @@ int main(int argc, char *argv[]) SDL_WaitThread(rgssThread, 0); else SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(), - "The RGSS script seems to be stuck and mkxp will now force quit", win); + "The RGSS script seems to be stuck and OneShot will now force quit", win); if (!rtData.rgssErrorMsg.empty()) { From a813c5aecd9588b5a0b298be869bbd7a8622a382 Mon Sep 17 00:00:00 2001 From: Vinyl Darkscratch Date: Thu, 4 Oct 2018 11:22:22 -0700 Subject: [PATCH 2/2] Update Readme for Conan noobs like myself on Windows --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 9aaed3b..434c663 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,12 @@ conan remote add gooborg "https://api.bintray.com/conan/gooborgstudios/conan" conan remote add bincrafters "https://api.bintray.com/conan/bincrafters/public-conan" ``` +On Windows, you may need to edit `C:\Users\[username]\.conan\profiles\default` and add the following line in `[settings]` ("v141" is the current toolset version at the time of this writing): + +```sh +compiler.toolset=v141 +``` + Next, you can install all the required packages: ```sh