Changed DLL name.

KN4CK3R · KN4CK3R · commit f56e33bcae77 · 2016-10-29T16:31:26.000+02:00
diff --git a/NativeHelper/NativeHelper.vcxproj b/NativeHelper/NativeHelper.vcxproj
@@ -71,25 +71,25 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)_x86d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IncludePath>.\beaengine\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)_x64d</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <OutDir>$(SolutionDir)\bin\$(Configuration)\x64\</OutDir>
     <IncludePath>.\beaengine\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(ProjectName)_x86</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IncludePath>.\beaengine\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(ProjectName)_x64</TargetName>
+    <TargetName>$(ProjectName)</TargetName>
     <OutDir>$(SolutionDir)bin\$(Configuration)\x64\</OutDir>
     <IncludePath>.\beaengine\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
diff --git a/Util/NativeHelper.cs b/Util/NativeHelper.cs
@@ -8,6 +8,8 @@ namespace ReClassNET.Util
 {
 	public class NativeHelper : IDisposable
 	{
+		private const string NativeHelperDll = "NativeHelper.dll";
+
 		public enum RequestFunction
 		{
 			IsProcessValid,
@@ -103,20 +105,6 @@ public NativeHelper()
 		{
 			requestFunctionPtrReference = RequestFunctionPtr;
 
-#if DEBUG
-#if WIN32
-			const string NativeHelperDll = "NativeHelper_x86d.dll";
-#else
-			const string NativeHelperDll = "NativeHelper_x64d.dll";
-#endif
-#else
-#if WIN32
-			const string NativeHelperDll = "NativeHelper_x86.dll";
-#else
-			const string NativeHelperDll = "NativeHelper_x64.dll";
-#endif
-#endif
-
 			nativeHelperHandle = NativeMethods.LoadLibrary(NativeHelperDll);
 			if (nativeHelperHandle.IsNull())
 			{

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ namespace ReClassNET.Util`
`8`	`8`	`{`
`9`	`9`	`public class NativeHelper : IDisposable`
`10`	`10`	`{`
	`11`	`+ private const string NativeHelperDll = "NativeHelper.dll";`
	`12`	`+`
`11`	`13`	`public enum RequestFunction`
`12`	`14`	`{`
`13`	`15`	`IsProcessValid,`
`@@ -103,20 +105,6 @@ public NativeHelper()`
`103`	`105`	`{`
`104`	`106`	`requestFunctionPtrReference = RequestFunctionPtr;`
`105`	`107`
`106`		`-#if DEBUG`
`107`		`-#if WIN32`
`108`		`- const string NativeHelperDll = "NativeHelper_x86d.dll";`
`109`		`-#else`
`110`		`- const string NativeHelperDll = "NativeHelper_x64d.dll";`
`111`		`-#endif`
`112`		`-#else`
`113`		`-#if WIN32`
`114`		`- const string NativeHelperDll = "NativeHelper_x86.dll";`
`115`		`-#else`
`116`		`- const string NativeHelperDll = "NativeHelper_x64.dll";`
`117`		`-#endif`
`118`		`-#endif`
`119`		`-`
`120`	`108`	`nativeHelperHandle = NativeMethods.LoadLibrary(NativeHelperDll);`
`121`	`109`	`if (nativeHelperHandle.IsNull())`
`122`	`110`	`{`