Added preprocessor definitions for the architecture details of the DLLs Change-Id: I473d9f83cceb53247c407a5c7e30acd8346c6b40 Reviewed-on: https://swiftshader-review.googlesource.com/3033 Tested-by: Maxime Grégoire <mgregoire@google.com> Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libEGL/libEGL.vcxproj b/src/OpenGL/libEGL/libEGL.vcxproj index e9a4a92..e0ab7a6 100644 --- a/src/OpenGL/libEGL/libEGL.vcxproj +++ b/src/OpenGL/libEGL/libEGL.vcxproj
@@ -292,6 +292,9 @@ mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\" copy "$(OutDir)libEGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libEGL_translator.dll"</Command> </PostBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>WIN64</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\common\Object.cpp" />
diff --git a/src/OpenGL/libGL/libGL.vcxproj b/src/OpenGL/libGL/libGL.vcxproj index ee07dd6..36a8a33 100644 --- a/src/OpenGL/libGL/libGL.vcxproj +++ b/src/OpenGL/libGL/libGL.vcxproj
@@ -188,6 +188,9 @@ <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command> </PostBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>WIN64</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -253,6 +256,9 @@ <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command> </PostBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>WIN64</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> <ClCompile> @@ -316,6 +322,9 @@ <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command> </PostBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>WIN64</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\common\MatrixStack.cpp" />
diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj index d3f5cad..d4bfb95 100644 --- a/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj +++ b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
@@ -316,6 +316,9 @@ mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\" copy "$(OutDir)libGLES_CM.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_CM_translator.dll"</Command> </PostBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>WIN64</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\common\Image.cpp" />
diff --git a/src/OpenGL/libGLESv2/libGLESv2.vcxproj b/src/OpenGL/libGLESv2/libGLESv2.vcxproj index f9a8bd3..ac08bc2 100644 --- a/src/OpenGL/libGLESv2/libGLESv2.vcxproj +++ b/src/OpenGL/libGLESv2/libGLESv2.vcxproj
@@ -316,6 +316,9 @@ mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator" copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command> </PostBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>WIN64</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\common\Image.cpp" />
diff --git a/src/Radiance/libRAD/libRAD.vcxproj b/src/Radiance/libRAD/libRAD.vcxproj index 1251d5d..e4dc13a 100644 --- a/src/Radiance/libRAD/libRAD.vcxproj +++ b/src/Radiance/libRAD/libRAD.vcxproj
@@ -304,6 +304,9 @@ <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\" copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command> </PostBuildEvent> + <ResourceCompile> + <PreprocessorDefinitions>WIN64</PreprocessorDefinitions> + </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="Config.cpp" />