summaryrefslogtreecommitdiff
path: root/vsprops
diff options
context:
space:
mode:
authorGravatar ShizZy2013-09-04 22:09:15 -0400
committerGravatar ShizZy2013-09-04 22:09:15 -0400
commit86495a83c16538ddcab7da4ea68de38ee2d1837e (patch)
tree7f6b57ca0e01e972556f335b3000e2ffac6e0b96 /vsprops
parentadded build directory to be ignored by git (diff)
downloadyuzu-86495a83c16538ddcab7da4ea68de38ee2d1837e.tar.gz
yuzu-86495a83c16538ddcab7da4ea68de38ee2d1837e.tar.xz
yuzu-86495a83c16538ddcab7da4ea68de38ee2d1837e.zip
various fixes to be able to build project
Diffstat (limited to 'vsprops')
-rw-r--r--vsprops/app.props14
-rw-r--r--vsprops/base.props2
-rw-r--r--vsprops/externals.props6
3 files changed, 11 insertions, 11 deletions
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 @@
2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ImportGroup Label="PropertySheets" /> 3 <ImportGroup Label="PropertySheets" />
4 <PropertyGroup Label="UserMacros"> 4 <PropertyGroup Label="UserMacros">
5 <GekkoBinDir>$(SolutionDir)bin\$(PlatformName)\</GekkoBinDir> 5 <AkiruBinDir>$(SolutionDir)bin\$(PlatformName)\</AkiruBinDir>
6 </PropertyGroup> 6 </PropertyGroup>
7 <PropertyGroup> 7 <PropertyGroup>
8 <OutDir>$(GekkoBinDir)</OutDir> 8 <OutDir>$(AkiruBinDir)</OutDir>
9 <TargetName>$(ProjectName)$(Configuration)</TargetName> 9 <TargetName>$(ProjectName)$(Configuration)</TargetName>
10 </PropertyGroup> 10 </PropertyGroup>
11 <ItemDefinitionGroup> 11 <ItemDefinitionGroup>
12 <PostBuildEvent> 12 <PostBuildEvent>
13 <Command>xcopy "$(SolutionDir)data" "$(GekkoBinDir)" /Y /S /D 13 <Command>xcopy "$(SolutionDir)data" "$(AkiruBinDir)" /Y /S /D
14xcopy "$(ExternalsDir)glew-1.6.0\bin$(PlatformArchitecture)\glew32.dll" "$(GekkoBinDir)" /Y /S /D 14xcopy "$(ExternalsDir)glew-1.10.0\bin\Release\$(PlatformName)\glew32.dll" "$(AkiruBinDir)" /Y /S /D
15xcopy "$(ExternalsDir)sdl-2.0.0\lib\$(PlatformName)\SDL.dll" "$(GekkoBinDir)" /Y /S /D</Command> 15xcopy "$(ExternalsDir)glfw-3.0.2\lib-msvc100\glfw3.dll" "$(AkiruBinDir)" /Y /S /D</Command>
16 </PostBuildEvent> 16 </PostBuildEvent>
17 </ItemDefinitionGroup> 17 </ItemDefinitionGroup>
18 <ItemGroup> 18 <ItemGroup>
19 <BuildMacro Include="GekkoBinDir"> 19 <BuildMacro Include="AkiruBinDir">
20 <Value>$(GekkoBinDir)</Value> 20 <Value>$(AkiruBinDir)</Value>
21 </BuildMacro> 21 </BuildMacro>
22 </ItemGroup> 22 </ItemGroup>
23</Project> \ No newline at end of file 23</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 @@
13 <FunctionLevelLinking>true</FunctionLevelLinking> 13 <FunctionLevelLinking>true</FunctionLevelLinking>
14 <MultiProcessorCompilation>true</MultiProcessorCompilation> 14 <MultiProcessorCompilation>true</MultiProcessorCompilation>
15 <AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\akiru\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 15 <AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\akiru\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
16 <PreprocessorDefinitions>_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT =1</PreprocessorDefinitions> 16 <PreprocessorDefinitions>_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1</PreprocessorDefinitions>
17 <RuntimeTypeInfo>false</RuntimeTypeInfo> 17 <RuntimeTypeInfo>false</RuntimeTypeInfo>
18 </ClCompile> 18 </ClCompile>
19 <Link> 19 <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 @@
5 <ExternalsDir>$(SolutionDir)externals\</ExternalsDir> 5 <ExternalsDir>$(SolutionDir)externals\</ExternalsDir>
6 </PropertyGroup> 6 </PropertyGroup>
7 <PropertyGroup> 7 <PropertyGroup>
8 <_PropertySheetDisplayName>Externals</_PropertySheetDisplayName> 8 <_PropertySheetDisplayName>externals</_PropertySheetDisplayName>
9 </PropertyGroup> 9 </PropertyGroup>
10 <ItemDefinitionGroup> 10 <ItemDefinitionGroup>
11 <ClCompile> 11 <ClCompile>
@@ -15,8 +15,8 @@
15 </ClCompile> 15 </ClCompile>
16 <Lib /> 16 <Lib />
17 <Link> 17 <Link>
18 <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> 18 <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>
19 <AdditionalDependencies>libjpeg.lib;glfw3.lib;opengl32.lib;glew32.lib;glu32.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> 19 <AdditionalDependencies>glfw3dll.lib;opengl32.lib;glew32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
20 <IgnoreSpecificDefaultLibraries> 20 <IgnoreSpecificDefaultLibraries>
21 </IgnoreSpecificDefaultLibraries> 21 </IgnoreSpecificDefaultLibraries>
22 </Link> 22 </Link>