Commit 4c439436 by Maxime Grégoire

Added preprocessor definitions for the architecture details of the DLLs

Change-Id: I473d9f83cceb53247c407a5c7e30acd8346c6b40 Reviewed-on: https://swiftshader-review.googlesource.com/3033Tested-by: 's avatarMaxime Grégoire <mgregoire@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 90b0ba8d
...@@ -292,6 +292,9 @@ copy "$(OutDir)libEGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platfor ...@@ -292,6 +292,9 @@ copy "$(OutDir)libEGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platfor
mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\" mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\"
copy "$(OutDir)libEGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libEGL_translator.dll"</Command> copy "$(OutDir)libEGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libEGL_translator.dll"</Command>
</PostBuildEvent> </PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\common\Object.cpp" /> <ClCompile Include="..\common\Object.cpp" />
......
...@@ -188,6 +188,9 @@ copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platf ...@@ -188,6 +188,9 @@ copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platf
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"
copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command> copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command>
</PostBuildEvent> </PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
...@@ -253,6 +256,9 @@ copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platf ...@@ -253,6 +256,9 @@ copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platf
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"
copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command> copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command>
</PostBuildEvent> </PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
<ClCompile> <ClCompile>
...@@ -316,6 +322,9 @@ copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platf ...@@ -316,6 +322,9 @@ copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platf
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"
copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command> copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command>
</PostBuildEvent> </PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\common\MatrixStack.cpp" /> <ClCompile Include="..\common\MatrixStack.cpp" />
......
...@@ -316,6 +316,9 @@ copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Pla ...@@ -316,6 +316,9 @@ copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Pla
mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\" mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\"
copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command>
</PostBuildEvent> </PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\common\Image.cpp" /> <ClCompile Include="..\common\Image.cpp" />
......
...@@ -316,6 +316,9 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -316,6 +316,9 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator" mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command> copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command>
</PostBuildEvent> </PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\common\Image.cpp" /> <ClCompile Include="..\common\Image.cpp" />
......
...@@ -304,6 +304,9 @@ copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Comman ...@@ -304,6 +304,9 @@ copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Comman
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\"
copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command> copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>
</PostBuildEvent> </PostBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>WIN64</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Config.cpp" /> <ClCompile Include="Config.cpp" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment