From a9ba68428c453bb609cae32aa8d794930c119ecd Mon Sep 17 00:00:00 2001
From: Polarix <326684221@qq.com>
Date: Fri, 29 Jan 2021 22:54:27 +0800
Subject: [PATCH] 2021-01-29:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修正wxWidgets31适配工程文件的编译错误。
---
 .../Project/CodeBlocks/VirtualSDK_wx31.cbp    | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/VirtualSDK/Project/CodeBlocks/VirtualSDK_wx31.cbp b/VirtualSDK/Project/CodeBlocks/VirtualSDK_wx31.cbp
index 1f0cb4f..025326c 100644
--- a/VirtualSDK/Project/CodeBlocks/VirtualSDK_wx31.cbp
+++ b/VirtualSDK/Project/CodeBlocks/VirtualSDK_wx31.cbp
@@ -4,20 +4,20 @@
 	<Project>
 		<Option title="SimpleGUI VirtualSDK" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="mingw-w64" />
 		<Build>
 			<Target title="x86">
 				<Option output="../../../Build/x86/bin/SimpleGUI" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="../../../Build" />
 				<Option object_output="../../../Build/x86/obj" />
 				<Option type="0" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw-w64" />
 				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
-					<Add directory="$(#wxBin)/lib/gcc_x86_dll/mswu" />
+					<Add directory="$(#wx)/lib/gcc_x86_dll/mswu" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="$(#wxBin)/lib/gcc_x86_dll/mswu" />
+					<Add directory="$(#wx)/lib/gcc_x86_dll/mswu" />
 				</ResourceCompiler>
 				<Linker>
 					<Add library="libwxmsw31u_core.a" />
@@ -28,7 +28,7 @@
 					<Add library="libwxtiff.a" />
 					<Add library="libiconv.a" />
 					<Add directory="../../Library/lib32" />
-					<Add directory="$(#wxBin)/lib/gcc_x86_dll" />
+					<Add directory="$(#wx)/lib/gcc_x86_dll" />
 				</Linker>
 			</Target>
 			<Target title="x64">
@@ -36,13 +36,13 @@
 				<Option working_dir="../../../Build" />
 				<Option object_output="../../../Build/x64/obj" />
 				<Option type="0" />
-				<Option compiler="gcc" />
+				<Option compiler="mingw-w64" />
 				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
-					<Add directory="$(#wxBin)/lib/gcc_x64_dll/mswu" />
+					<Add directory="$(#wx)/lib/gcc_x64_dll/mswu" />
 				</Compiler>
 				<ResourceCompiler>
-					<Add directory="$(#wxBin)/lib/gcc_x64_dll/mswu" />
+					<Add directory="$(#wx)/lib/gcc_x64_dll/mswu" />
 				</ResourceCompiler>
 				<Linker>
 					<Add library="libwxmsw31u_core.a" />
@@ -53,7 +53,7 @@
 					<Add library="libwxtiff.a" />
 					<Add library="libiconv64.a" />
 					<Add directory="../../Library/lib64" />
-					<Add directory="$(#wxBin)/lib/gcc_x64_dll" />
+					<Add directory="$(#wx)/lib/gcc_x64_dll" />
 				</Linker>
 			</Target>
 		</Build>
@@ -68,7 +68,8 @@
 			<Add option="-D__WXMSW__" />
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DwxUSE_UNICODE" />
-			<Add directory="$(#wxBin)/include" />
+			<Add option="-D_SIMPLE_GUI_DEMO_INNER_CHS_" />
+			<Add directory="$(#wx)/include" />
 			<Add directory="../../Application/inc" />
 			<Add directory="../../Common/inc" />
 			<Add directory="../../Library/inc" />
@@ -83,7 +84,7 @@
 			<Add directory="../../../DemoProc/inc" />
 		</Compiler>
 		<ResourceCompiler>
-			<Add directory="$(#wxBin)/include" />
+			<Add directory="$(#wx)/include" />
 		</ResourceCompiler>
 		<Linker>
 			<Add option="-O3" />
@@ -100,6 +101,9 @@
 		<Unit filename="../../../DemoProc/src/Basic.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../../../DemoProc/src/Curve.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../../../DemoProc/src/DemoProc.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -208,10 +212,6 @@
 		<Unit filename="../../Resource/Resource.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
+		<Extensions />
 	</Project>
 </CodeBlocks_project_file>