Commit 5cebbd14 authored by Jan Möbius's avatar Jan Möbius

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

parent 0d3cce6d
Pipeline #1640 passed with stage
......@@ -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>
</ul>
<b>Build System</b>
<ul>
<li>Some fixes for min gw (Thanks to Xan for the patch)</li>
</ul>
</tr>
......
......@@ -66,7 +66,7 @@ endmacro ()
# set directory structures for the different platforms
if (WIN32)
if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
set (ACG_PROJECT_DATADIR ".")
set (ACG_PROJECT_LIBDIR "lib")
set (ACG_PROJECT_BINDIR ".")
......
......@@ -15,7 +15,7 @@ if ( WIN32 )
set( ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS )
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_SHARED_LINKER_FLAGS "/LARGEADDRESSAWARE" )
list(APPEND ADDITIONAL_CMAKE_MODULE_LINKER_FLAGS "/LARGEADDRESSAWARE" )
......
......@@ -47,7 +47,7 @@
\*===========================================================================*/
// 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 )
#endif
......
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