Merge branch 'master' into qmake-to-cmake

CMakeLists.txt

@@ -152,7 +152,7 @@ set(MAIN_SOURCE
 if(WIN32)
 	list(APPEND MAIN_SOURCE assets/resources.rc)
 	list(APPEND DEFINES UNICODE)
-	list(APPEND PLATFORM_LIBRARIES Secur32)
+	list(APPEND PLATFORM_LIBRARIES Secur32 Shlwapi)
 	include_directories(
 		${CMAKE_CURRENT_BINARY_DIR}/windows
 	)
@@ -267,6 +267,7 @@ set(BINDING_HEADERS
 	binding-mri/sceneelement-binding.h
 	binding-mri/viewportelement-binding.h
 	binding-mri/flashable-binding.h
+	binding-mri/journal-binding.h
 )
 set(BINDING_SOURCE
 	binding-mri/binding-mri.cpp

conanfile.py

@@ -16,14 +16,18 @@ class MkxpConan(ConanFile):
         "openal/1.18.2@bincrafters/stable",
         "physfs/3.0.1@eliza/stable",
         "pixman/0.34.0@bincrafters/stable",
-        "ruby/2.5.1@eliza/stable",
+        "ruby/2.3.7@eliza/stable",
         "sdl2/2.0.8@bincrafters/stable",
         "sdl2_image/2.0.3@bincrafters/stable",
         "sdl2_ttf/2.0.14@eliza/stable",
         "sdl_sound-mkxp/1.0.1@eliza/stable",
         "sigc++/2.10.0@eliza/stable",
     )
+    options = {
+        "platform": ["standalone", "steam"],
+    }
     default_options = (
+        "platform=standalone",
         "boost:without_test=True",
         "cygwin_installer:packages=xxd",
     )
@@ -34,6 +38,8 @@ class MkxpConan(ConanFile):
 
     def build_configure(self):
         cmake = CMake(self)
+        if self.options.platform == "steam":
+            cmake.definitions["STEAM"] = "ON"
         cmake.configure()
         cmake.build()
 

src/config.cpp

@@ -35,6 +35,18 @@
 #include "util.h"
 #include "sdl-util.h"
 
+namespace std
+{
+	std::ostream& operator<<(std::ostream &os, const std::vector<std::string> &vec)
+	{
+		for (auto item : vec)
+		{
+			os << item << " ";
+		}
+		return os;
+	}
+}
+
 static std::string prefPath(const char *org, const char *app)
 {
 	char *path = SDL_GetPrefPath(org, app);
@@ -117,9 +129,9 @@ void Config::read(int argc, char *argv[])
 	po::options_description podesc;
 	podesc.add_options()
 	        PO_DESC_ALL
-	        ("preloadScript", po::value<StringVec>()->composing())
+	        ("preloadScript", po::value<StringVec>()->composing()->default_value(StringVec()))
-	        ("fontSub", po::value<StringVec>()->composing())
+	        ("fontSub", po::value<StringVec>()->composing()->default_value(StringVec()))
-	        ("rubyLoadpath", po::value<StringVec>()->composing())
+	        ("rubyLoadpath", po::value<StringVec>()->composing()->default_value(StringVec()))
 	        ;
 
 	po::variables_map vm;

src/main.cpp

@@ -46,10 +46,6 @@
 
 #include "binding.h"
 
-#ifdef __WINDOWS__
-#include "resource.h"
-#endif
-
 #include "icon.png.xxd"
 
 #ifdef STEAM