Revision: 65291
http://sourceforge.net/p/brlcad/code/65291
Author: starseeker
Date: 2015-06-15 00:40:59 +0000 (Mon, 15 Jun 2015)
Log Message:
-----------
Don't include config_win.h if we're using mingw
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/include/common.h
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2015-06-15 00:03:38 UTC (rev 65290)
+++ brlcad/trunk/CMakeLists.txt 2015-06-15 00:40:59 UTC (rev 65291)
@@ -2455,10 +2455,10 @@
CONFIG_H_APPEND(BRLCAD "#define BRLCAD_COMPILE_USER ${BRLCAD_COMPILE_USER}\n")
CONFIG_H_APPEND(BRLCAD "#define BRLCAD_COMPILE_COUNT
${BRLCAD_COMPILE_COUNT}\n")
-# If we're building on Windows, use config_win.h file
-if(WIN32)
+# If we're building on Windows with MSVC, use config_win.h file
+if(MSVC)
CONFIG_H_APPEND(BRLCAD "#include \"config_win.h\"\n")
-endif(WIN32)
+endif(MSVC)
# Now that all the tests are done, configure the brlcad_config.h file:
CONFIG_H_APPEND(BRLCAD "#endif /* __CONFIG_H__ */\n")
Modified: brlcad/trunk/include/common.h
===================================================================
--- brlcad/trunk/include/common.h 2015-06-15 00:03:38 UTC (rev 65290)
+++ brlcad/trunk/include/common.h 2015-06-15 00:40:59 UTC (rev 65291)
@@ -41,7 +41,7 @@
*/
#if defined(BRLCADBUILD) && defined(HAVE_CONFIG_H)
-# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(CMAKE_HEADERS)
+# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__) &&
!defined(CMAKE_HEADERS)
# include "config_win.h"
# else
# include "brlcad_config.h"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
