Merge branch 'MINGW_changes' into 'master'

Mingw changes

TODO: Test 

See merge request !68
This commit is contained in:
Jan Möbius
2016-05-31 12:23:33 +02:00
4 changed files with 7 additions and 6 deletions

View File

@@ -35,7 +35,7 @@ if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh")
endif()
if (WIN32)
if (WIN32 AND NOT MINGW)
if ( OPENMESH_BUILD_SHARED )
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)

View File

@@ -25,9 +25,9 @@ acg_append_files (sources "*.cc" ${directories})
#Drop the template only cc files
acg_drop_templates(sources)
IF(WIN32)
IF(WIN32 AND NOT MINGW)
acg_append_files (sources "*.c" ${directories})
ENDIF(WIN32)
ENDIF(WIN32 AND NOT MINGW)
# Disable Library installation when not building OpenMesh on its own but as part of another project!
if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh")