From 86495a83c16538ddcab7da4ea68de38ee2d1837e Mon Sep 17 00:00:00 2001
From: ShizZy
Date: Wed, 4 Sep 2013 22:09:15 -0400
Subject: various fixes to be able to build project

---
 vsprops/app.props       | 14 +++++++-------
 vsprops/base.props      |  2 +-
 vsprops/externals.props |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'vsprops')

diff --git a/vsprops/app.props b/vsprops/app.props
index 0b45648e4..6a152b304 100644
--- a/vsprops/app.props
+++ b/vsprops/app.props
@@ -2,22 +2,22 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <GekkoBinDir>$(SolutionDir)bin\$(PlatformName)\</GekkoBinDir>
+    <AkiruBinDir>$(SolutionDir)bin\$(PlatformName)\</AkiruBinDir>
   </PropertyGroup>
   <PropertyGroup>
-    <OutDir>$(GekkoBinDir)</OutDir>
+    <OutDir>$(AkiruBinDir)</OutDir>
     <TargetName>$(ProjectName)$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <PostBuildEvent>
-      <Command>xcopy "$(SolutionDir)data" "$(GekkoBinDir)" /Y /S /D
-xcopy "$(ExternalsDir)glew-1.6.0\bin$(PlatformArchitecture)\glew32.dll" "$(GekkoBinDir)" /Y /S /D
-xcopy "$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName)\SDL.dll" "$(GekkoBinDir)" /Y /S /D</Command>
+      <Command>xcopy "$(SolutionDir)data" "$(AkiruBinDir)" /Y /S /D
+xcopy "$(ExternalsDir)glew-1.10.0\bin\Release\$(PlatformName)\glew32.dll" "$(AkiruBinDir)" /Y /S /D
+xcopy "$(ExternalsDir)glfw-3.0.2\lib-msvc100\glfw3.dll" "$(AkiruBinDir)" /Y /S /D</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <BuildMacro Include="GekkoBinDir">
-      <Value>$(GekkoBinDir)</Value>
+    <BuildMacro Include="AkiruBinDir">
+      <Value>$(AkiruBinDir)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/vsprops/base.props b/vsprops/base.props
index d127e15da..2eb647e98 100644
--- a/vsprops/base.props
+++ b/vsprops/base.props
@@ -13,7 +13,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\akiru\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT =1</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1</PreprocessorDefinitions>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
     </ClCompile>
     <Link>
diff --git a/vsprops/externals.props b/vsprops/externals.props
index 1a578c5e4..c49a095ec 100644
--- a/vsprops/externals.props
+++ b/vsprops/externals.props
@@ -5,7 +5,7 @@
     <ExternalsDir>$(SolutionDir)externals\</ExternalsDir>
   </PropertyGroup>
   <PropertyGroup>
-    <_PropertySheetDisplayName>Externals</_PropertySheetDisplayName>
+    <_PropertySheetDisplayName>externals</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -15,8 +15,8 @@
     </ClCompile>
     <Lib />
     <Link>
-      <AdditionalLibraryDirectories>$(ExternalsDir)glew-1.6.0\lib$(PlatformArchitecture);$(ExternalsDir)glfw-3.0\lib$(PlatformArchitecture)\$(Configuration);$(ExternalsDir)libjpeg;$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;glfw3.lib;opengl32.lib;glew32.lib;glu32.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ExternalsDir)glew-1.10.0\lib\Release\$(PlatformName);$(ExternalsDir)glfw-3.0.2\lib-msvc100;$(ExternalsDir)libjpeg;$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>glfw3dll.lib;opengl32.lib;glew32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
     </Link>
-- 
cgit v1.2.3