From 80064cf5405f5b80d9fcff925947ee05801c1952 Mon Sep 17 00:00:00 2001 From: twanvl Date: Sat, 9 Aug 2008 16:01:02 +0000 Subject: [PATCH] fixed non-unicode build git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1120 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/cli/cli_main.cpp | 12 +++++++----- src/util/version.cpp | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/cli/cli_main.cpp b/src/cli/cli_main.cpp index b29fe1de..83616e44 100644 --- a/src/cli/cli_main.cpp +++ b/src/cli/cli_main.cpp @@ -150,11 +150,13 @@ void CLISetInterface::handleCommand(const String& command) { if (arg.empty()) { cli.showError(_("Give a shell command to execute.")); } else { - #ifdef __WXMSW__ - _wsystem(arg.c_str()); - #elif UNICODE - wxCharBuffer buf = arg.fn_str(); - system(buf); + #if UNICODE + #ifdef __WXMSW__ + _wsystem(arg.c_str()); // TODO: is this function available on other platforms? + #else + wxCharBuffer buf = arg.fn_str(); + system(buf); + #endif #else system(arg.c_str()); #endif diff --git a/src/util/version.cpp b/src/util/version.cpp index cb622ff5..5c1e0f7c 100644 --- a/src/util/version.cpp +++ b/src/util/version.cpp @@ -73,6 +73,7 @@ const Char* version_suffix = _(" (beta, ascii build)"); * 0.3.4 : html export; choice rendering based on scripted 'image' * 0.3.5 : word lists, symbol font 'as text' * 0.3.6 : free rotation, rotation behaviour changed. + * 0.3.7 : scripting language changes (@ operator, stricter type conversion). */ const Version file_version_locale = 307; // 0.3.7 const Version file_version_set = 306; // 0.3.6