From 9befa9b5d5ea4e15a2abbe1870d69b308a8da05f Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Mon, 28 Mar 2016 15:30:58 +0200
Subject: [PATCH] Some code re-organization.

---
 Make.cmd                                               |  2 +-
 .../{MHashJava384.sln => MHashJava384_Native.sln}      |  2 +-
 ...HashJava384.vcxproj => MHashJava384_Native.vcxproj} | 18 +++++++++---------
 ...roj.filters => MHashJava384_Native.vcxproj.filters} |  0
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename bindings/Java/native/{MHashJava384.sln => MHashJava384_Native.sln} (93%)
 rename bindings/Java/native/{MHashJava384.vcxproj => MHashJava384_Native.vcxproj} (92%)
 rename bindings/Java/native/{MHashJava384.vcxproj.filters => MHashJava384_Native.vcxproj.filters} (100%)

diff --git a/Make.cmd b/Make.cmd
index 664fda5..5d3a047 100644
--- a/Make.cmd
+++ b/Make.cmd
@@ -126,7 +126,7 @@ call "%MSVC_PATH%\vcvarsall.bat"
 set "MSVC_PROJECTS=MHashLib.sln"
 set "MSVC_PROJECTS=%MSVC_PROJECTS%,bindings\Microsoft.NET\example\MHashDotNet384_Example.sln"
 set "MSVC_PROJECTS=%MSVC_PROJECTS%,bindings\Microsoft.NET\wrapper\MHashDotNet384_Wrapper.sln"
-set "MSVC_PROJECTS=%MSVC_PROJECTS%,bindings\Java\native\MHashJava384.sln"
+set "MSVC_PROJECTS=%MSVC_PROJECTS%,bindings\Java\native\MHashJava384_Native.sln"
 set "MSVC_PROJECTS=%MSVC_PROJECTS%,bindings\Python\native\MHashPy384_Native.sln"
 set "MSVC_PROJECTS=%MSVC_PROJECTS%,bindings\Delphi\native\MHashDelphi384.sln"
 
diff --git a/bindings/Java/native/MHashJava384.sln b/bindings/Java/native/MHashJava384_Native.sln
similarity index 93%
rename from bindings/Java/native/MHashJava384.sln
rename to bindings/Java/native/MHashJava384_Native.sln
index ade81eb..133406b 100644
--- a/bindings/Java/native/MHashJava384.sln
+++ b/bindings/Java/native/MHashJava384_Native.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MHashJava384", "MHashJava384.vcxproj", "{98971AF0-1B4D-4B5A-A174-9B099F7977B8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MHashJava384_Native", "MHashJava384_Native.vcxproj", "{98971AF0-1B4D-4B5A-A174-9B099F7977B8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/bindings/Java/native/MHashJava384.vcxproj b/bindings/Java/native/MHashJava384_Native.vcxproj
similarity index 92%
rename from bindings/Java/native/MHashJava384.vcxproj
rename to bindings/Java/native/MHashJava384_Native.vcxproj
index 680cb71..916423e 100644
--- a/bindings/Java/native/MHashJava384.vcxproj
+++ b/bindings/Java/native/MHashJava384_Native.vcxproj
@@ -28,7 +28,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{98971AF0-1B4D-4B5A-A174-9B099F7977B8}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>MHashJava384</RootNamespace>
+    <RootNamespace>MHashJava384_Native</RootNamespace>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -80,25 +80,25 @@
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)\bin\$(PlatformShortName)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\obj\$(PlatformShortName)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName).$(PlatformShortName)</TargetName>
+    <TargetName>MHashJava384.$(PlatformShortName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)\bin\$(PlatformShortName)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\obj\$(PlatformShortName)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName).$(PlatformShortName)</TargetName>
+    <TargetName>MHashJava384.$(PlatformShortName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)\bin\$(PlatformShortName)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\obj\$(PlatformShortName)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName).$(PlatformShortName)</TargetName>
+    <TargetName>MHashJava384.$(PlatformShortName)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)\bin\$(PlatformShortName)\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)\obj\$(PlatformShortName)\$(Configuration)\</IntDir>
-    <TargetName>$(ProjectName).$(PlatformShortName)</TargetName>
+    <TargetName>MHashJava384.$(PlatformShortName)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -107,7 +107,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MHASHJAVA384_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\..\..\..\include;$(JDK_HOME)\include;;$(JDK_HOME)\include\win32</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\..\..\..\include;$(JDK_HOME)\include;$(JDK_HOME)\include\win32</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -121,7 +121,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;MHASHJAVA384_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\..\..\..\include;$(JDK_HOME)\include;;$(JDK_HOME)\include\win32</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\..\..\..\include;$(JDK_HOME)\include;$(JDK_HOME)\include\win32</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -137,7 +137,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MHASHJAVA384_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\..\..\..\include;$(JDK_HOME)\include;;$(JDK_HOME)\include\win32</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\..\..\..\include;$(JDK_HOME)\include;$(JDK_HOME)\include\win32</AdditionalIncludeDirectories>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
@@ -163,7 +163,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MHASHJAVA384_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\..\..\..\include;$(JDK_HOME)\include;;$(JDK_HOME)\include\win32</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\include;$(SolutionDir)\..\..\..\include;$(JDK_HOME)\include;$(JDK_HOME)\include\win32</AdditionalIncludeDirectories>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
diff --git a/bindings/Java/native/MHashJava384.vcxproj.filters b/bindings/Java/native/MHashJava384_Native.vcxproj.filters
similarity index 100%
rename from bindings/Java/native/MHashJava384.vcxproj.filters
rename to bindings/Java/native/MHashJava384_Native.vcxproj.filters
-- 
2.11.0