Home Explore Help
Register Sign In
Hero3
/
vcmi
mirror of https://github.com/vcmi/vcmi.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Missing changes.

DjWarmonger 11 years ago
parent
f418b468c4
commit
4a71442c80
8 changed files with 11 additions and 12 deletions
Split View Show Diff Stats
  1. 1 1
      AI/BattleAI/BattleAI.vcxproj
  2. 1 1
      AI/EmptyAI/EmptyAI.vcxproj
  3. 1 1
      AI/StupidAI/StupidAI.vcxproj
  4. 2 2
      client/VCMI_client.vcxproj
  5. 1 2
      lib/VCMI_lib.vcxproj
  6. 1 1
      lib/minizip/minizip.vcxproj
  7. 2 2
      server/VCMI_server.vcxproj
  8. 2 2
      test/Test.vcxproj

+ 1 - 1
AI/BattleAI/BattleAI.vcxproj
View File 

@@ -80,7 +80,7 @@
 
     <OutDir>$(VCMI_Out)\AI\</OutDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">

-    <OutDir>$(VCMI_Out)\AI\</OutDir>

+    <OutDir>..</OutDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">

     <OutDir>$(VCMI_Out)\AI\</OutDir>

+ 1 - 1
AI/EmptyAI/EmptyAI.vcxproj
View File 

@@ -96,7 +96,7 @@
 
     <OutDir>$(VCMI_Out)\AI\</OutDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">

-    <OutDir>$(VCMI_Out)\AI\</OutDir>

+    <OutDir>..</OutDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">

     <OutDir>$(VCMI_Out)\AI\</OutDir>

+ 1 - 1
AI/StupidAI/StupidAI.vcxproj
View File 

@@ -80,7 +80,7 @@
 
     <OutDir>$(VCMI_Out)\AI\</OutDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">

-    <OutDir>$(VCMI_Out)\AI\</OutDir>

+    <OutDir>..</OutDir>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">

     <OutDir>$(VCMI_Out)\AI\</OutDir>

+ 2 - 2
client/VCMI_client.vcxproj
View File 

@@ -75,7 +75,7 @@
 
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCMI_Out)</OutDir>
 
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
 
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
 
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(VCMI_Out)</OutDir>
 
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">..</OutDir>
 
     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(VCMI_Out)</OutDir>
 
     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(Configuration)\</IntDir>
 
     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(Configuration)\</IntDir>
 
@@ -145,7 +145,7 @@
 
       <LinkTimeCodeGeneration>
 
       </LinkTimeCodeGeneration>
 
       <ShowProgress>NotSet</ShowProgress>
 
-      <AdditionalLibraryDirectories>..\..\libs</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\libs;..</AdditionalLibraryDirectories>
 
     </Link>
 
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">

+ 1 - 2
lib/VCMI_lib.vcxproj
View File 

@@ -37,7 +37,6 @@
 
   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-

     <CharacterSet>Unicode</CharacterSet>

     <PlatformToolset>v110</PlatformToolset>

     <WholeProgramOptimization>true</WholeProgramOptimization>

@@ -77,7 +76,7 @@
 
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCMI_Out)</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(VCMI_Out)</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">..</OutDir>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(VCMI_Out)</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(Configuration)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(Configuration)\</IntDir>

+ 1 - 1
lib/minizip/minizip.vcxproj
View File 

@@ -100,7 +100,7 @@
 
   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">

     <IncludePath>$(SolutionDir)..\include;$(IncludePath)</IncludePath>

-    <OutDir>$(VCMI_Out)\</OutDir>

+    <OutDir>..</OutDir>

     <LibraryPath>$(SolutionDir)..\libs\$(PlatformShortName);$(VCMI_Out);$(LibraryPath)</LibraryPath>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">

+ 2 - 2
server/VCMI_server.vcxproj
View File 

@@ -75,7 +75,7 @@
 
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCMI_Out)</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(VCMI_Out)</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">..</OutDir>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(VCMI_Out)</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(Configuration)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(Configuration)\</IntDir>

@@ -131,7 +131,7 @@
 
     </ClCompile>

     <Link>

       <AdditionalDependencies>VCMI_lib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>..\..\libs;</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>..\..\libs;..</AdditionalLibraryDirectories>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">

+ 2 - 2
test/Test.vcxproj
View File 

@@ -75,7 +75,7 @@
 
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCMI_Out)</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(VCMI_Out)</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">..</OutDir>

     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(VCMI_Out)</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(Configuration)\</IntDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(Configuration)\</IntDir>

@@ -141,7 +141,7 @@
 
       <LinkTimeCodeGeneration>

       </LinkTimeCodeGeneration>

       <ShowProgress>NotSet</ShowProgress>

-      <AdditionalLibraryDirectories>..\..\libs</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>..\..\libs;..</AdditionalLibraryDirectories>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">