aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Galdrikian <[email protected]>2017-08-30 20:58:43 -0700
committerBryan Galdrikian <[email protected]>2017-08-30 20:58:43 -0700
commitdfd35d59af675144b282a3e0c57ac8b1735977df (patch)
treec6716f7c1767f83dfddacdce6d292c8ffbcf3e7d
parentFractureTool: assetToFractureId fix (diff)
downloadblast-dfd35d59af675144b282a3e0c57ac8b1735977df.tar.xz
blast-dfd35d59af675144b282a3e0c57ac8b1735977df.zip
Linux build fixes, corresponding doc changes
-rw-r--r--blast_tools_and_samples-windows.zipbin71345342 -> 71345342 bytes
-rw-r--r--docs/api_docs/files/_nv_blast_ext_authoring_types_8h-source.html2
-rw-r--r--docs/source_docs/files/_nv_blast_ext_authoring_types_8h-source.html2
-rw-r--r--sdk/compiler/cmake/linux/CMakeLists.txt2
-rw-r--r--sdk/extensions/authoring/include/NvBlastExtAuthoringTypes.h2
-rw-r--r--test/compiler/cmake/linux/CMakeLists.txt7
6 files changed, 11 insertions, 4 deletions
diff --git a/blast_tools_and_samples-windows.zip b/blast_tools_and_samples-windows.zip
index 3a90a0f..003bdcb 100644
--- a/blast_tools_and_samples-windows.zip
+++ b/blast_tools_and_samples-windows.zip
Binary files differ
diff --git a/docs/api_docs/files/_nv_blast_ext_authoring_types_8h-source.html b/docs/api_docs/files/_nv_blast_ext_authoring_types_8h-source.html
index 9c0e8ff..40d0dbc 100644
--- a/docs/api_docs/files/_nv_blast_ext_authoring_types_8h-source.html
+++ b/docs/api_docs/files/_nv_blast_ext_authoring_types_8h-source.html
@@ -156,7 +156,7 @@
<a name="l00150"></a><a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">00150</a> int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a>;
<a name="l00151"></a><a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">00151</a> int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a>;
<a name="l00152"></a>00152
-<a name="l00153"></a><a class="code" href="struct_nv_1_1_blast_1_1_facet.html#83f40acf14f917fa9419c535d0abb55b">00153</a> <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#83f40acf14f917fa9419c535d0abb55b">Facet</a>(int32_t fEdge = 0, uint32_t eCount = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a> = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a> = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a> = 0) : <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#bfdb6136b83a8e77799a7d6c57a89f3b">firstEdgeNumber</a>(fEdge), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#cff8a5cd0bdb20eb2209359a68849e94">edgesCount</a>(eCount), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a>), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a>), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a>) {}
+<a name="l00153"></a><a class="code" href="struct_nv_1_1_blast_1_1_facet.html#83f40acf14f917fa9419c535d0abb55b">00153</a> <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#83f40acf14f917fa9419c535d0abb55b">Facet</a>(int32_t fEdge = 0, uint32_t eCount = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a> = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a> = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a> = 0) : <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#bfdb6136b83a8e77799a7d6c57a89f3b">firstEdgeNumber</a>(fEdge), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#cff8a5cd0bdb20eb2209359a68849e94">edgesCount</a>(eCount), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a>), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a>), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a>) {}
<a name="l00154"></a>00154 };
<a name="l00155"></a>00155
<a name="l00159"></a><a class="code" href="class_nv_1_1_blast_1_1_random_generator_base.html">00159</a> <span class="keyword">class </span><a class="code" href="class_nv_1_1_blast_1_1_random_generator_base.html">RandomGeneratorBase</a>
diff --git a/docs/source_docs/files/_nv_blast_ext_authoring_types_8h-source.html b/docs/source_docs/files/_nv_blast_ext_authoring_types_8h-source.html
index fb825bc..b729641 100644
--- a/docs/source_docs/files/_nv_blast_ext_authoring_types_8h-source.html
+++ b/docs/source_docs/files/_nv_blast_ext_authoring_types_8h-source.html
@@ -172,7 +172,7 @@
<a name="l00150"></a><a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">00150</a> int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a>;
<a name="l00151"></a><a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">00151</a> int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a>;
<a name="l00152"></a>00152
-<a name="l00153"></a><a class="code" href="struct_nv_1_1_blast_1_1_facet.html#83f40acf14f917fa9419c535d0abb55b">00153</a> <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#83f40acf14f917fa9419c535d0abb55b">Facet</a>(int32_t fEdge = 0, uint32_t eCount = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a> = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a> = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a> = 0) : <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#bfdb6136b83a8e77799a7d6c57a89f3b">firstEdgeNumber</a>(fEdge), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#cff8a5cd0bdb20eb2209359a68849e94">edgesCount</a>(eCount), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a>), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a>), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a>) {}
+<a name="l00153"></a><a class="code" href="struct_nv_1_1_blast_1_1_facet.html#83f40acf14f917fa9419c535d0abb55b">00153</a> <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#83f40acf14f917fa9419c535d0abb55b">Facet</a>(int32_t fEdge = 0, uint32_t eCount = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a> = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a> = 0, int32_t <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a> = 0) : <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#bfdb6136b83a8e77799a7d6c57a89f3b">firstEdgeNumber</a>(fEdge), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#cff8a5cd0bdb20eb2209359a68849e94">edgesCount</a>(eCount), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#3732bd9f53adff02b3a10847a814d284">userData</a>), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#85004b9d37b2b0cadb3143f295c3ae61">materialId</a>), <a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a>(<a class="code" href="struct_nv_1_1_blast_1_1_facet.html#b41a791ee0ddb9c5cb823d43c4baa19c">smoothingGroup</a>) {}
<a name="l00154"></a>00154 };
<a name="l00155"></a>00155
<a name="l00159"></a><a class="code" href="class_nv_1_1_blast_1_1_random_generator_base.html">00159</a> <span class="keyword">class </span><a class="code" href="class_nv_1_1_blast_1_1_random_generator_base.html">RandomGeneratorBase</a>
diff --git a/sdk/compiler/cmake/linux/CMakeLists.txt b/sdk/compiler/cmake/linux/CMakeLists.txt
index d0cf60a..1a6497d 100644
--- a/sdk/compiler/cmake/linux/CMakeLists.txt
+++ b/sdk/compiler/cmake/linux/CMakeLists.txt
@@ -1,6 +1,6 @@
#Platform specific compile flags and project includes
-SET(CMAKE_CXX_FLAGS "-Wextra -Werror -fdiagnostics-show-option -fno-rtti -fno-exceptions -m64 -msse2 -mfpmath=sse -fPIC -ffast-math -fno-exceptions -fno-rtti -Wno-invalid-offsetof -Wno-unknown-pragmas -std=c++0x")
+SET(CMAKE_CXX_FLAGS "-Wextra -Werror -fdiagnostics-show-option -fno-rtti -fno-exceptions -m64 -msse2 -mfpmath=sse -fPIC -ffast-math -fno-exceptions -fno-rtti -Wno-invalid-offsetof -Wno-unknown-pragmas -std=c++0x -Wreorder")
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -gdwarf-2")
SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g3 -gdwarf-2 -fno-strict-aliasing")
diff --git a/sdk/extensions/authoring/include/NvBlastExtAuthoringTypes.h b/sdk/extensions/authoring/include/NvBlastExtAuthoringTypes.h
index 833798a..5f14b04 100644
--- a/sdk/extensions/authoring/include/NvBlastExtAuthoringTypes.h
+++ b/sdk/extensions/authoring/include/NvBlastExtAuthoringTypes.h
@@ -150,7 +150,7 @@ struct Facet
int32_t materialId;
int32_t smoothingGroup;
- Facet(int32_t fEdge = 0, uint32_t eCount = 0, int32_t materialId = 0, int32_t userData = 0, int32_t smoothingGroup = 0) : firstEdgeNumber(fEdge), edgesCount(eCount), materialId(materialId), userData(userData), smoothingGroup(smoothingGroup) {}
+ Facet(int32_t fEdge = 0, uint32_t eCount = 0, int32_t materialId = 0, int32_t userData = 0, int32_t smoothingGroup = 0) : firstEdgeNumber(fEdge), edgesCount(eCount), userData(userData), materialId(materialId), smoothingGroup(smoothingGroup) {}
};
/**
diff --git a/test/compiler/cmake/linux/CMakeLists.txt b/test/compiler/cmake/linux/CMakeLists.txt
index 6f37b5f..03383f3 100644
--- a/test/compiler/cmake/linux/CMakeLists.txt
+++ b/test/compiler/cmake/linux/CMakeLists.txt
@@ -2,6 +2,13 @@
SET(CMAKE_CXX_FLAGS "-Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions -m64 -msse2 -mfpmath=sse -fpic -ffast-math -fno-exceptions -fno-rtti -Wno-invalid-offsetof -Wno-unknown-pragmas -Wno-multichar -Wno-sign-compare -std=c++0x")
+if (CMAKE_COMPILER_IS_GNUCXX)
+ #Starting with 6.0 -fPIE is the default and our gtest build can't link with this
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -no-pie")
+ endif()
+endif()
+
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -gdwarf-2")
SET(CMAKE_CXX_FLAGS_CHECKED "-O3 -g3 -gdwarf-2 -fno-strict-aliasing")
SET(CMAKE_CXX_FLAGS_PROFILE "-O3 -fno-strict-aliasing")