Merge pull request #93 from Dakraid/fix/zlib-version-bump

Update zlib in mob.ini to 1.2.12

.gitignore

@@ -1,6 +1,15 @@
+# mob-specific files
 /build
 /vs/obj
 /vs/.vs
 /vs/*.user
 /mob.exe
 /mob.log
+
+# Files built by mob
+/*/build
+/*/downloads
+/*/install
+/*/releases
+/*/mob.ini
+/*/mob.log

mob.ini

@@ -94,10 +94,10 @@ sevenz         = 19.00
 boost          = 1.75.0
 boost_vs       = 14.2
 fmt            = 7.1.3
-gtest          = master
-libloot        = 0.16.1
-libloot_hash   = gd8c9b98
-libloot_branch = 0.16.1
+gtest          = main
+libloot        = 0.17.1
+libloot_hash   = ge670605
+libloot_branch = 0.17.1
 lz4            = v1.9.3
 nmm            = 0.71.2
 openssl        = 1.1.1i
@@ -110,7 +110,7 @@ sip            = 5.5.0
 spdlog         = v1.8.2
 qt             = 5.15.2
 qt_vs          = 2019
-zlib           = 1.2.11
+zlib           = 1.2.12
 libbsarch      = 0.0.8
 usvfs          = master
 explorerpp     = 1.3.5
@@ -119,7 +119,10 @@ ss_paper_lad_6788      = 7.0
 ss_paper_automata_6788 = 3.0
 ss_paper_mono_6788     = 2.2
 ss_dark_mode_1809_6788 = 3.0
-ss_morrowind_trosski   = 1.0
+ss_morrowind_trosski   = 1.1
+ss_skyrim_trosski      = v1.1
+ss_fallout3_trosski    = v1.1
+ss_fallout4_trosski    = v1.1
 
 [paths]
 third_party          =

readme.md

@@ -40,8 +40,8 @@
   - Desktop development with C++
   - Git for Windows (if you don't have git already installed)
   - .NET Framework 3.5 development tools
-  - .NET Framework 4.6 targeting pack
-  - .NET Framework 4.6.1 targeting pack and SDK
+  - .NET Framework 4.6 targeting pack (alternative: [Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/net46))
+  - .NET Framework 4.8 targeting pack and SDK (alternative: [Developer Pack](https://dotnet.microsoft.com/download/dotnet-framework/net48))
 - Start a shell
   - If you have git in your path, a regular cmd shell works.
   - If not, start the _x64 Native Tools Command Prompt for VS 2019_, it'll use Git for Windows installed above.

src/cmd/commands.h

@@ -310,6 +310,7 @@ public:
 	void make_bin();
 	void make_pdbs();
 	void make_src();
+	void make_uibase();
 	void make_installer();
 
 protected:
@@ -331,6 +332,7 @@ private:
 	bool bin_ = true;
 	bool src_ = true;
 	bool pdbs_ = true;
+	bool uibase_ = true;
 	bool installer_ = false;
 	std::string utf8out_;
 	fs::path out_;

src/cmd/release.cpp

@@ -100,6 +100,27 @@ void release_command::make_src()
 		files, tasks::modorganizer::super_path(), out);
 }
 
+void release_command::make_uibase()
+{
+	const auto out = out_ / make_filename("uibase");
+	u8cout << "making uibase archive " << path_to_utf8(out) << "\n";
+
+	std::vector<fs::path> files;
+
+	if (!fs::exists(tasks::modorganizer::super_path()))
+	{
+		gcx().bail_out(context::generic,
+			"modorganizer super path not found: {}",
+			tasks::modorganizer::super_path());
+	}
+
+	op::archive_from_glob(gcx(),
+		tasks::modorganizer::super_path() / "uibase" / "src" / "*.h", out, {});
+	op::archive_from_glob(gcx(),
+		tasks::modorganizer::super_path() / "game_features" / "src" / "*.h", out, {});
+	op::archive_from_files(gcx(), { conf().path().install_libs() / "uibase.lib" }, conf().path().install_libs(), out);
+}
+
 void release_command::make_installer()
 {
 	const auto file = "Mod.Organizer-" + version_ + ".exe";
@@ -191,6 +212,11 @@ clipp::group release_command::do_group()
 				clipp::option("--no-src").set(src_, false)
 			) % "sets whether the source archive is created [default: yes]",
 
+			//(
+			//	clipp::option("--uibase").set(uibase_, true) |
+			//	clipp::option("--no-uibase").set(uibase_, false)
+			//) % "sets whether the uibase archive is created [default: yes]",
+
 			(
 				clipp::option("--inst").set(installer_, true) |
 				clipp::option("--no-inst").set(installer_, false)
@@ -286,6 +312,9 @@ int release_command::do_devbuild()
 	if (src_)
 		make_src();
 
+	if (uibase_)
+		make_uibase();
+
 	if (installer_)
 		make_installer();
 
@@ -311,6 +340,7 @@ int release_command::do_official()
 	make_bin();
 	make_pdbs();
 	make_src();
+	make_uibase();
 	make_installer();
 
 	return 0;

src/main.cpp

@@ -88,6 +88,7 @@ void add_tasks()
 	// the one from the specific plugin
 	add_task<parallel_tasks>()
 		.add_task<mo>("modorganizer-game_oblivion", mo::gamebryo)
+		.add_task<mo>("modorganizer-game_nehrim", mo::gamebryo)
 		.add_task<mo>("modorganizer-game_fallout3", mo::gamebryo)
 		.add_task<mo>("modorganizer-game_fallout4", mo::gamebryo)
 		.add_task<mo>("modorganizer-game_fallout4vr", mo::gamebryo)

src/tasks/sip.cpp

@@ -212,7 +212,7 @@ void sip::generate_header()
 	// by plugin_python
 	run_tool(process_runner(process()
 		.binary(sip_module_exe())
-		.chcp(850)
+		.chcp(65001)
 		.stdout_encoding(encodings::acp)
 		.stderr_encoding(encodings::acp)
 		.arg("--sip-h")

src/tasks/stylesheets.cpp

@@ -44,7 +44,31 @@ std::vector<stylesheets::release> releases()
 			"Trosski",
 			"ModOrganizer_Style_Morrowind",
 			conf().version().get("ss_morrowind_trosski"),
-			"Transparent-Style-Morrowind",
+			"Morrowind-MO2-Stylesheet",
+			""
+		},
+
+		{
+			"Trosski",
+			"Mod-Organizer-2-Skyrim-Stylesheet",
+			conf().version().get("ss_skyrim_trosski"),
+			"Skyrim-MO2-Stylesheet",
+			""
+		},
+
+		{
+			"Trosski",
+			"ModOrganizer_Style_Fallout3",
+			conf().version().get("ss_fallout3_trosski"),
+			"Fallout3-MO2-Stylesheet",
+			""
+		},
+
+		{
+			"Trosski",
+			"Mod-Organizer2-Fallout-4-Stylesheet",
+			conf().version().get("ss_fallout4_trosski"),
+			"Fallout4-MO2-Stylesheet",
 			""
 		}
 	};