Fix build for build computer

TellowKrinkle · Mar 28, 2021 · 56b3eb4 · 56b3eb4
1 parent c85a3c4
commit 56b3eb4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/3rdparty/fmt/fmt b/3rdparty/fmt/fmt
diff --git a/pcsx2/DEV9/Linux/Linux.cpp b/pcsx2/DEV9/Linux/Linux.cpp
@@ -175,6 +175,7 @@ void OnOk()
 
 void DEV9configure()
 {
+#ifndef __APPLE__
 	ScopedCoreThreadPause paused_core;
 	Config oldConfig = config;
 
@@ -213,4 +214,5 @@ void DEV9configure()
 	ApplyConfigIfRunning(oldConfig);
 
 	paused_core.AllowResume();
+#endif
 }
diff --git a/pcsx2/gui/Dialogs/GSDumpDialog.cpp b/pcsx2/gui/Dialogs/GSDumpDialog.cpp
@@ -43,6 +43,20 @@
 #include <wx/wfstream.h>
 #include <functional>
 
+constexpr const char* Dialogs::GSDumpDialog::GSTransferPathNames[];
+constexpr const char* Dialogs::GSDumpDialog::GifFlagNames[];
+constexpr const char* Dialogs::GSDumpDialog::TEXTFXNames[];
+constexpr const char* Dialogs::GSDumpDialog::TEXTCCNames[];
+constexpr const char* Dialogs::GSDumpDialog::TEXPSMNames[];
+constexpr const char* Dialogs::GSDumpDialog::TEXCSMNames[];
+constexpr const char* Dialogs::GSDumpDialog::GsFSTNames[];
+constexpr const char* Dialogs::GSDumpDialog::GsCTXTNames[];
+constexpr const char* Dialogs::GSDumpDialog::TEXCPSMNames[];
+constexpr const char* Dialogs::GSDumpDialog::GSTypeNames[];
+constexpr const char* Dialogs::GSDumpDialog::GsPrimNames[];
+constexpr const char* Dialogs::GSDumpDialog::GsIIPNames[];
+constexpr const char* Dialogs::GSDumpDialog::GsFIXNames[];
+
 namespace GSDump
 {
 	bool isRunning = false;

diff --git a/plugins/GSdx/GSVector4i.h b/plugins/GSdx/GSVector4i.h
@@ -113,10 +113,7 @@ class alignas(16) GSVector4i
 	{
 	}
 
-	__forceinline GSVector4i(const GSVector4i& v)
-	{
-		m = v.m;
-	}
+	__forceinline GSVector4i(const GSVector4i& v) = default;
 
 	__forceinline explicit GSVector4i(const GSVector2i& v)
 	{
+0 −0		.github/pull_request_template.md
+0 −44		.github/workflows/windows.yml
+20 −30		CMakeLists.txt
+0 −3		CONTRIBUTING.md
+9 −434		ChangeLog.rst
+115 −127		README.rst
+2 −6		doc/CMakeLists.txt
+15 −65		doc/api.rst
+19 −9		doc/build.py
+24 −22		doc/index.rst
+0 −63		doc/usage.rst
+42 −37		include/fmt/chrono.h
+10 −47		include/fmt/color.h
+23 −59		include/fmt/compile.h
+104 −344		include/fmt/core.h
+273 −1,621		include/fmt/format-inl.h
+463 −694		include/fmt/format.h
+29 −15		include/fmt/locale.h
+37 −67		include/fmt/os.h
+9 −19		include/fmt/ostream.h
+2 −2		include/fmt/printf.h
+6 −16		include/fmt/ranges.h
+2 −32		src/format.cc
+6 −11		src/os.cc
+2 −0		support/README
+27 −0		support/fmt.pro
+30 −0		support/update-coverity-branch.py
+4 −12		test/CMakeLists.txt
+1 −1		test/add-subdirectory-test/CMakeLists.txt
+1 −5		test/assert-test.cc
+0 −11		test/chrono-test.cc
+0 −13		test/color-test.cc
+1 −1		test/compile-error-test/CMakeLists.txt
+25 −32		test/compile-test.cc
+101 −88		test/core-test.cc
+58 −0		test/custom-formatter-test.cc
+1 −1		test/find-package-test/CMakeLists.txt
+3 −3		test/format
+6 −0		test/format-dyn-args-test.cc
+65 −55		test/format-impl-test.cc
+113 −139		test/format-test.cc
+25 −17		test/fuzzing/CMakeLists.txt
+26 −3		test/fuzzing/README.md
+28 −6		test/fuzzing/build.sh
+0 −135		test/fuzzing/chrono-duration.cc
+152 −0		test/fuzzing/chrono_duration.cpp
+0 −34		test/fuzzing/float.cc
+0 −75		test/fuzzing/fuzzer-common.h
+67 −0		test/fuzzing/fuzzer_common.h
+0 −22		test/fuzzing/main.cc
+21 −0		test/fuzzing/main.cpp
+0 −100		test/fuzzing/named-arg.cc
+128 −0		test/fuzzing/named_arg.cpp
+0 −91		test/fuzzing/one-arg.cc
+131 −0		test/fuzzing/one_arg.cpp
+116 −0		test/fuzzing/sprintf.cpp
+0 −105		test/fuzzing/two-args.cc
+112 −0		test/fuzzing/two_args.cpp
+75 −0		test/grisu-test.cc
+1 −7		test/gtest-extra.h
+0 −51		test/locale-test.cc
+11 −23		test/os-test.cc
+6 −27		test/ostream-test.cc
+2 −50		test/ranges-test.cc