diff options
| author |  bunnei | 2014-04-07 00:57:37 -0400 |
|---|---|---|
| committer | bunnei | 2014-04-07 00:57:37 -0400 |
| commit | f446f79da27d8c75b85772654152ea8e67a2214d (patch) | |
| tree | cf3924876405ed5244fc8ee72c8615cc74e51267 /vsprops/base.props | |
| parent | Remove Core::GetState(). Use new ARM_Interface instead. (diff) | |
| parent | removed unused comments, changed main processing loop to be infinite (diff) | |
| download | yuzu-f446f79da27d8c75b85772654152ea8e67a2214d.tar.gz yuzu-f446f79da27d8c75b85772654152ea8e67a2214d.tar.xz yuzu-f446f79da27d8c75b85772654152ea8e67a2214d.zip | |
Merge branch 'hardware-interface'
Conflicts:
src/core/src/core.h
Diffstat (limited to 'vsprops/base.props')
| -rw-r--r-- | vsprops/base.props | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vsprops/base.props b/vsprops/base.props index 0f59b512b..6241bd44b 100644 --- a/vsprops/base.props +++ b/vsprops/base.props | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <StructMemberAlignment>16Bytes</StructMemberAlignment> | 12 | <StructMemberAlignment>16Bytes</StructMemberAlignment> |
| 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\citra\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 15 | <AdditionalIncludeDirectories>$(SolutionDir)src\common\src;$(SolutionDir)src\core\src;$(SolutionDir)src\video_core\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| 16 | <PreprocessorDefinitions> | 16 | <PreprocessorDefinitions> |
| 17 | </PreprocessorDefinitions> | 17 | </PreprocessorDefinitions> |
| 18 | <RuntimeTypeInfo>false</RuntimeTypeInfo> | 18 | <RuntimeTypeInfo>false</RuntimeTypeInfo> |