Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes for min gw (Thanks to Xan for the patch)

Browse Source
This commit is contained in:
Jan Möbius
2016-05-09 11:15:25 +02:00
parent 0d3cce6d0a
commit 5cebbd146f
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Doc/changelog.docu
View File

@@ -18,6 +18,11 @@
<li>PolyMesh: Copy per-halfedge and per-face properties to new elments during triangulation (Thanks to Max Limper for the patch)</li> <li>PolyMesh: Copy per-halfedge and per-face properties to new elments during triangulation (Thanks to Max Limper for the patch)</li>
</ul> </ul>
<b>Build System</b>
<ul>
<li>Some fixes for min gw (Thanks to Xan for the patch)</li>
</ul>
</tr> </tr>

2
cmake/ACGCommon.cmake
View File

@@ -66,7 +66,7 @@ endmacro ()
# set directory structures for the different platforms # set directory structures for the different platforms
if (WIN32) if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
set (ACG_PROJECT_DATADIR ".") set (ACG_PROJECT_DATADIR ".")
set (ACG_PROJECT_LIBDIR "lib") set (ACG_PROJECT_LIBDIR "lib")
set (ACG_PROJECT_BINDIR ".") set (ACG_PROJECT_BINDIR ".")

2
cmake/ACGCompiler.cmake
View File

@@ -15,7 +15,7 @@ if ( WIN32 )
set( ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS ) set( ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS )
if ( WINDOWS_LARGE_MEMORY_SUPPORT ) if ( WINDOWS_LARGE_MEMORY_SUPPORT )
if( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles") if (MSVC)
list(APPEND ADDITIONAL_CMAKE_EXE_LINKER_FLAGS "/LARGEADDRESSAWARE" ) list(APPEND ADDITIONAL_CMAKE_EXE_LINKER_FLAGS "/LARGEADDRESSAWARE" )
list(APPEND ADDITIONAL_CMAKE_SHARED_LINKER_FLAGS "/LARGEADDRESSAWARE" ) list(APPEND ADDITIONAL_CMAKE_SHARED_LINKER_FLAGS "/LARGEADDRESSAWARE" )
list(APPEND ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS "/LARGEADDRESSAWARE" ) list(APPEND ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS "/LARGEADDRESSAWARE" )

2
src/OpenMesh/Core/System/OpenMeshDLLMacros.hh
View File

@@ -47,7 +47,7 @@
\*===========================================================================*/ \*===========================================================================*/
// Disable the warnings about needs to have DLL interface as we have tons of vector templates // Disable the warnings about needs to have DLL interface as we have tons of vector templates
#ifdef WIN32 #ifdef _MSC_VER
#pragma warning( disable: 4251 ) #pragma warning( disable: 4251 )
#endif #endif