Add wx paths to the config properties

aegisub/build/Aegisub/Aegisub.DefaultConfiguration.props

@@ -53,6 +53,10 @@
     <AegisubUseUpdateChecker>true</AegisubUseUpdateChecker>
     <UpdateCheckerServer>updates.aegisub.org</UpdateCheckerServer>
     <UpdateCheckerURL>/trunk</UpdateCheckerURL>
+    <WxBasePath>$(AegisubSourceBase)wxlib</WxBasePath>
+    <WxLibraryPath Condition="'$(Platform)'=='Win32'">$(WxBasePath)\lib32</WxLibraryPath>
+    <WxLibraryPath Condition="'$(Platform)'=='x64'">$(WxBasePath)\lib64</WxLibraryPath>
+    <WxIncludePath>$(WxBasePath)\include</WxIncludePath>
   </PropertyGroup>
 
 </Project>

aegisub/build/Aegisub/Aegisub.xml

@@ -45,6 +45,28 @@
     <Category Name="Paths" DisplayName="Library paths" Description="Configure third-party library paths" />
   </Rule.Categories>
 
+  <StringProperty
+    Subtype="folder"
+    Name="WxBasePath"
+    Category="Paths"
+    DisplayName="wxWidgets root"
+    Description="Root directory of the wxWidgets installation to use"
+    />
+  <StringProperty
+    Subtype="folder"
+    Name="WxLibraryPath"
+    Category="Paths"
+    DisplayName="wxWidgets library path"
+    Description="Location of compiled wxWidgets library files"
+    />
+  <StringProperty
+    Subtype="folder"
+    Name="WxIncludePath"
+    Category="Paths"
+    DisplayName="wxWidgets include path"
+    Description="Location of wxWidgets header files"
+    />
+
   <BoolProperty
     Name="AegisubUseDSound"
     Category="Features"

aegisub/build/wx.props

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PropertySheetDisplayName>wxWidgets support</_PropertySheetDisplayName>
@@ -10,15 +10,25 @@
     <WxLibDbgSuffix Condition="'$(Configuration)'=='Release'"></WxLibDbgSuffix>
   </PropertyGroup>
 
+  <ItemDefinitionGroup>
     <!-- Tell the compiler where to search for wx headers and libraries -->
-	<PropertyGroup>
-		<IncludePath>$(WxLibraryPath)\mswu$(WxLibDbgSuffix)\;$(WxIncludePath);$(IncludePath)</IncludePath>
-		<LibraryPath>$(WxLibraryPath);$(LibraryPath)</LibraryPath>
-	</PropertyGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>
+        $(WxLibraryPath)\mswu$(WxLibDbgSuffix);
+        $(WxIncludePath);
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>$(WxIncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalLibraryDirectories>
+        $(WxLibraryPath);
+        %(AdditionalLibraryDirectories)
+      </AdditionalLibraryDirectories>
 
       <!-- Tell the linker to use the appropriate wx libraries -->
-	<ItemDefinitionGroup>
-		<Link>
       <AdditionalDependencies>
         wxbase29u$(WxLibDbgSuffix).lib;
         wxbase29u$(WxLibDbgSuffix)_net.lib;