Skip to content

S
swiftshader
Commit 08ccba0d by Nicolas Capens Committed by Nicolas Capens
Options

Switch from GCC to Clang.

BUG=18470793 Change-Id: I850fdd6314f0932c052e334f60ad4e272de51398 Reviewed-on: https://swiftshader-review.googlesource.com/1463Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 1763eeba
Showing with 26 additions and 26 deletions
src/Common/Debug.hpp
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
void trace(const char *format, ...); void trace(const char *format, ...);
#ifndef NDEBUG #ifndef NDEBUG
#define TRACE(format, ...) trace("[0x%0.8X]%s("format")\n", this, __FUNCTION__, ##__VA_ARGS__) #define TRACE(format, ...) trace("[0x%0.8X]%s(" format ")\n", this, __FUNCTION__, ##__VA_ARGS__)
#else #else
#define TRACE(...) ((void)0) #define TRACE(...) ((void)0)
#endif #endif
...@@ -33,7 +33,7 @@ void trace(const char *format, ...); ...@@ -33,7 +33,7 @@ void trace(const char *format, ...);
#endif #endif
#ifndef NDEBUG #ifndef NDEBUG
#define ASSERT(expression) {if(!(expression)) trace("\t! Assert failed in %s(%d): "#expression"\n", __FUNCTION__, __LINE__); assert(expression);} #define ASSERT(expression) {if(!(expression)) trace("\t! Assert failed in %s(%d): " #expression "\n", __FUNCTION__, __LINE__); assert(expression);}
#else #else
#define ASSERT assert #define ASSERT assert
#endif #endif
......
src/LLVM/LLVM.cbp
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
<Project> <Project>
<Option title="LLVM" /> <Option title="LLVM" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Build> <Build>
<Target title="Debug x86"> <Target title="Debug x86">
<Option output="bin/x86/Debug/LLVM" prefix_auto="1" extension_auto="1" /> <Option output="bin/x86/Debug/LLVM" prefix_auto="1" extension_auto="1" />
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="obj/x86/Debug/" /> <Option object_output="obj/x86/Debug/" />
<Option type="2" /> <Option type="2" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="obj/x86/Release/" /> <Option object_output="obj/x86/Release/" />
<Option type="2" /> <Option type="2" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <Compiler>
<Add option="-march=i686" /> <Add option="-march=i686" />
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="obj/x64/Debug/" /> <Option object_output="obj/x64/Debug/" />
<Option type="2" /> <Option type="2" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<Option working_dir="" /> <Option working_dir="" />
<Option object_output="obj/x64/Release/" /> <Option object_output="obj/x64/Release/" />
<Option type="2" /> <Option type="2" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <Compiler>
<Add option="-march=core2" /> <Add option="-march=core2" />
...@@ -86,8 +86,8 @@ ...@@ -86,8 +86,8 @@
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-std=c++11" />
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-std=c++11" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
<Add option="-fno-operator-names" /> <Add option="-fno-operator-names" />
<Add option="-msse2" /> <Add option="-msse2" />
......
src/OpenGL/libEGL/libEGL.cbp
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<Project> <Project>
<Option title="libEGL" /> <Option title="libEGL" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Build> <Build>
<Target title="Debug x86"> <Target title="Debug x86">
<Option output="./../../../lib/Debug_x86/libEGL.so.1" prefix_auto="0" extension_auto="0" /> <Option output="./../../../lib/Debug_x86/libEGL.so.1" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Debug/" /> <Option object_output="obj/x86/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<Option output="./../../../lib/Release_x86/libEGL.so.1" prefix_auto="0" extension_auto="0" /> <Option output="./../../../lib/Release_x86/libEGL.so.1" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Release/" /> <Option object_output="obj/x86/Release/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<Option output="./../../../lib/Debug_x64/libEGL.so.1" prefix_auto="0" extension_auto="0" /> <Option output="./../../../lib/Debug_x64/libEGL.so.1" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Debug/" /> <Option object_output="obj/x64/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<Option output="./../../../lib/Release_x64/libEGL.so.1" prefix_auto="0" extension_auto="0" /> <Option output="./../../../lib/Release_x64/libEGL.so.1" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Release/" /> <Option object_output="obj/x64/Release/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-std=c++11" />
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-std=c++11" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
<Add directory="./../include/" /> <Add directory="./../include/" />
<Add directory="./../" /> <Add directory="./../" />
......
src/OpenGL/libGLESv2/libGLESv2.cbp
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<Project> <Project>
<Option title="libGLESv2" /> <Option title="libGLESv2" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Build> <Build>
<Target title="Debug x86"> <Target title="Debug x86">
<Option output="./../../../lib/Debug_x86/libGLESv2.so.2" prefix_auto="0" extension_auto="0" /> <Option output="./../../../lib/Debug_x86/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Debug/" /> <Option object_output="obj/x86/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<Option output="./../../../lib/Release_x86/libGLESv2.so.2" prefix_auto="0" extension_auto="0" /> <Option output="./../../../lib/Release_x86/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Release/" /> <Option object_output="obj/x86/Release/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<Option output="./../../../lib/Debug_x64/libGLESv2.so.2" prefix_auto="0" extension_auto="0" /> <Option output="./../../../lib/Debug_x64/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Debug/" /> <Option object_output="obj/x64/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<Option output="./../../../lib/Release_x64/libGLESv2.so.2" prefix_auto="0" extension_auto="0" /> <Option output="./../../../lib/Release_x64/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Release/" /> <Option object_output="obj/x64/Release/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
...@@ -102,8 +102,8 @@ ...@@ -102,8 +102,8 @@
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-std=c++11" />
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-std=c++11" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
<Add option="-fno-operator-names" /> <Add option="-fno-operator-names" />
<Add option="-msse2" /> <Add option="-msse2" />
......
tests/third_party/PowerVR/Examples/Beginner/01_HelloAPI/OGLES2/Build/OGLES2HelloAPI.cbp
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<Project> <Project>
<Option title="OGLES2HelloAPI" /> <Option title="OGLES2HelloAPI" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Build> <Build>
<Target title="Debug x86"> <Target title="Debug x86">
<Option output="bin/Debug_x86/OGLES2HelloAPI" prefix_auto="1" extension_auto="1" /> <Option output="bin/Debug_x86/OGLES2HelloAPI" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug_x86/" /> <Option object_output="obj/Debug_x86/" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-m32" /> <Add option="-m32" />
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<Option output="bin/Release_x86/OGLES2HelloAPI" prefix_auto="1" extension_auto="1" /> <Option output="bin/Release_x86/OGLES2HelloAPI" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Release_x86/" /> <Option object_output="obj/Release_x86/" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-m32" /> <Add option="-m32" />
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<Option working_dir="../../../../../../../../lib/Debug_x64" /> <Option working_dir="../../../../../../../../lib/Debug_x64" />
<Option object_output="obj/Debug_x64/" /> <Option object_output="obj/Debug_x64/" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<Option output="bin/Release_x64/OGLES2HelloAPI" prefix_auto="1" extension_auto="1" /> <Option output="bin/Release_x64/OGLES2HelloAPI" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Release_x64/" /> <Option object_output="obj/Release_x64/" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
</Compiler> </Compiler>
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-std=c++11" />
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-std=c++11" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
<Add directory="../../../../../Builds/Include" /> <Add directory="../../../../../Builds/Include" />
</Compiler> </Compiler>
......
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