update for MingW/CMake

- ignore MSVC warnings when FREE_WINDOWS is defined to quiet warnings.
- the CMake flags were not being set correctly making blender have weirdo colors (no -funsigned-char).
This commit is contained in:
Campbell Barton
2010-09-15 16:13:32 +00:00
parent 95a3f41096
commit 9b518710c6
55 changed files with 75 additions and 77 deletions
+8 -12
View File
@@ -315,7 +315,7 @@ IF(UNIX AND NOT APPLE)
ENDIF(WITH_OPENMP)
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
SET(PLATFORM_LINKFLAGS "-pthread")
@@ -540,19 +540,12 @@ IF(WIN32)
ELSE(MSVC) # MINGW
SET(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
SET(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
SET(CMAKE_CXX_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C++ flags ")
SET(CMAKE_C_FLAGS "-pipe -funsigned-char -fno-strict-aliasing" CACHE STRING "Mingw C flags ")
# Better warnings
SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement -Wno-unknown-pragmas")
SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C++ flags ")
SET(CMAKE_CXX_FLAGS_RELEASE " -O2" CACHE STRING "Mingw release C++ flags ")
SET(CMAKE_CXX_FLAGS_MINSIZEREL " -Os" CACHE STRING "Mingw minsize release C++ flags ")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
SET(CMAKE_C_FLAGS_DEBUG "-O0 -g" CACHE STRING "Mingw debug C flags ")
SET(CMAKE_C_FLAGS_RELEASE "-O2" CACHE STRING "Mingw release C flags ")
SET(CMAKE_C_FLAGS_MINSIZEREL "-Os" CACHE STRING "Mingw minsize release C flags ")
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g" CACHE STRING "Mingw release, debug C++ flags ")
ADD_DEFINITIONS(-DFREE_WINDOWS)
IF(WITH_OPENMP)
@@ -616,6 +609,9 @@ IF(WIN32)
SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/OpenEXR)
SET(OPENEXR_LIB Half IlmImf Imath IlmThread)
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
# TODO, gives linking errors, force off
SET(WITH_IMAGE_OPENEXR OFF)
ENDIF(WITH_IMAGE_OPENEXR)
IF(WITH_IMAGE_TIFF)
+1 -1
View File
@@ -34,7 +34,7 @@
#ifndef _GHOST_DEBUG_H_
#define _GHOST_DEBUG_H_
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#ifdef _DEBUG
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
// #define GHOST_DEBUG
+1 -1
View File
@@ -87,7 +87,7 @@ char *PIL_dynlib_get_error_as_string(PILdynlib* lib) {
return buf;
}
return err;
return NULL;
}
void PIL_dynlib_close(PILdynlib *lib) {
+1 -1
View File
@@ -41,12 +41,12 @@
#ifdef WIN32
#include <io.h>
#include "BLI_winstuff.h"
#include "BLI_callbacks.h"
#else
#include <unistd.h> // for read close
#include <sys/param.h>
#endif
#include "BLI_blenlib.h"
#include "BKE_utildefines.h"
+1 -1
View File
@@ -33,7 +33,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "MEM_guardedalloc.h"
#include "BLI_path_util.h"
#include "BLI_string.h"
#define WIN32_SKIP_HKEY_PROTECTION // need to use HKEY
+5 -7
View File
@@ -280,13 +280,10 @@ void fsmenu_read_bookmarks(struct FSMenu* fsmenu, const char *filename)
void fsmenu_read_system(struct FSMenu* fsmenu)
{
char line[256];
FILE *fp;
#ifdef WIN32
/* Add the drive names to the listing */
{
__int64 tmp;
char folder[256];
char tmps[4];
int i;
@@ -304,10 +301,10 @@ void fsmenu_read_system(struct FSMenu* fsmenu)
}
/* Adding Desktop and My Documents */
SHGetSpecialFolderPath(0, folder, CSIDL_PERSONAL, 0);
fsmenu_insert_entry(fsmenu,FS_CATEGORY_BOOKMARKS, folder, 1, 0);
SHGetSpecialFolderPath(0, folder, CSIDL_DESKTOPDIRECTORY, 0);
fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, folder, 1, 0);
SHGetSpecialFolderPath(0, line, CSIDL_PERSONAL, 0);
fsmenu_insert_entry(fsmenu,FS_CATEGORY_BOOKMARKS, line, 1, 0);
SHGetSpecialFolderPath(0, line, CSIDL_DESKTOPDIRECTORY, 0);
fsmenu_insert_entry(fsmenu, FS_CATEGORY_BOOKMARKS, line, 1, 0);
}
#else
#ifdef __APPLE__
@@ -474,6 +471,7 @@ void fsmenu_read_system(struct FSMenu* fsmenu)
/* loop over mount points */
struct mntent *mnt;
int len;
FILE *fp;
fp = setmntent (MOUNTED, "r");
if (fp == NULL) {
@@ -35,6 +35,7 @@
#include "BKE_global.h"
#ifdef _WIN32
#undef INFINITY
#define INFINITY FLT_MAX // in mingw math.h: (1.0F/0.0F). This generates compile error, though.
#endif
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <stdio.h>
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// don't show stl-warnings
#pragma warning (disable:4786)
#endif
@@ -29,7 +29,7 @@
#ifndef __KX_BLENDERINPUTDEVICE
#define __KX_BLENDERINPUTDEVICE
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning(disable : 4786) // shut off 255 char limit debug template warning
#endif
@@ -26,7 +26,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// annoying warnings about truncated STL debug info
#pragma warning (disable :4786)
#endif
@@ -26,7 +26,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// annoying warnings about truncated STL debug info
#pragma warning (disable :4786)
#endif
@@ -30,7 +30,7 @@
#ifndef __KX_BLENDERRENDERTOOLS
#define __KX_BLENDERRENDERTOOLS
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// don't show stl-warnings
#pragma warning (disable:4786)
#endif
@@ -28,11 +28,14 @@
#include "KX_ISystem.h"
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable :4786)
#include <windows.h>
#endif //WIN32
#ifdef WIN32
#include <windows.h>
#endif
#include <iostream>
#include <stdio.h>
#include "KX_BlenderInputDevice.h"
@@ -28,7 +28,7 @@
* Convert blender data to ketsji
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif
@@ -30,7 +30,7 @@
#ifndef BL_DEFORMABLEGAMEOBJECT
#define BL_DEFORMABLEGAMEOBJECT
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
@@ -28,7 +28,7 @@
* Simple deformation controller that restores a mesh to its rest position
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// This warning tells us about truncation of __long__ stl-generated names.
// It can occasionally cause DevStudio to have internal compiler warnings.
#pragma warning( disable : 4786 )
@@ -36,7 +36,7 @@
#include "MT_Point3.h"
#include <stdlib.h>
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
@@ -27,7 +27,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif //WIN32
@@ -30,7 +30,7 @@
#ifndef BL_MODIFIERDEFORMER
#define BL_MODIFIERDEFORMER
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
@@ -27,7 +27,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif //WIN32
@@ -30,7 +30,7 @@
#ifndef BL_SHAPEDEFORMER
#define BL_SHAPEDEFORMER
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
@@ -27,7 +27,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif //WIN32
@@ -30,7 +30,7 @@
#ifndef BL_SKINDEFORMER
#define BL_SKINDEFORMER
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
@@ -26,8 +26,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#endif
#include "KX_Scene.h"
@@ -28,7 +28,7 @@
* Convert Blender actuators for use in the GameEngine
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif //WIN32
@@ -30,7 +30,7 @@
#include <stdio.h>
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif //WIN32
@@ -39,7 +39,7 @@
#include "KX_ConvertSensors.h"
/* This little block needed for linking to Blender... */
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#include "BLI_winstuff.h"
#endif
@@ -26,8 +26,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// don't show stl-warnings
#pragma warning (disable:4786)
#endif
@@ -27,7 +27,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif //WIN32
@@ -30,7 +30,7 @@
#ifndef KX_SOFTBODYDEFORMER
#define KX_SOFTBODYDEFORMER
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
+1 -1
View File
@@ -13,7 +13,7 @@
*
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786)
#endif //WIN32
@@ -12,7 +12,7 @@
*
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786)
#endif
@@ -29,7 +29,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// This warning tells us about truncation of __long__ stl-generated names.
// It can occasionally cause DevStudio to have internal compiler warnings.
#pragma warning( disable : 4786 )
@@ -29,7 +29,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// This warning tells us about truncation of __long__ stl-generated names.
// It can occasionally cause DevStudio to have internal compiler warnings.
#pragma warning( disable : 4786 )
@@ -30,7 +30,7 @@
#ifndef __KX_LOGICMANAGER
#define __KX_LOGICMANAGER
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786)
#endif
@@ -30,7 +30,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// This warning tells us about truncation of __long__ stl-generated names.
// It can occasionally cause DevStudio to have internal compiler warnings.
#pragma warning( disable : 4786 )
@@ -26,8 +26,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// This warning tells us about truncation of __long__ stl-generated names.
// It can occasionally cause DevStudio to have internal compiler warnings.
#pragma warning( disable : 4786 )
@@ -26,7 +26,7 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif
+1 -1
View File
@@ -34,7 +34,7 @@ typedef unsigned __int64 uint_ptr;
typedef unsigned long uint_ptr;
#endif
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// This warning tells us about truncation of __long__ stl-generated names.
// It can occasionally cause DevStudio to have internal compiler warnings.
#pragma warning( disable : 4786 )
+1 -1
View File
@@ -31,7 +31,7 @@
#ifndef __KX_GAMEOBJECT
#define __KX_GAMEOBJECT
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// get rid of this stupid "warning 'this' used in initialiser list", generated by VC when including Solid/Sumo
#pragma warning (disable : 4355)
#endif
@@ -34,7 +34,7 @@ typedef unsigned __int64 uint_ptr;
typedef unsigned long uint_ptr;
#endif
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// This warning tells us about truncation of __long__ stl-generated names.
// It can occasionally cause DevStudio to have internal compiler warnings.
#pragma warning( disable : 4786 )
+1 -1
View File
@@ -28,7 +28,7 @@
* The engine ties all game modules together.
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif //WIN32
+1 -2
View File
@@ -26,8 +26,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif
@@ -28,7 +28,7 @@
* KX_MouseFocusSensor determines mouse in/out/over events.
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// This warning tells us about truncation of __long__ stl-generated names.
// It can occasionally cause DevStudio to have internal compiler warnings.
#pragma warning( disable : 4786 )
+1 -1
View File
@@ -28,7 +28,7 @@
* Initialize Python thingies.
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif //WIN32
+1 -1
View File
@@ -30,7 +30,7 @@
#include "GL/glew.h"
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif //WIN32
+1 -1
View File
@@ -28,7 +28,7 @@
* Ketsji scene. Holds references to all scene data.
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable : 4786)
#endif //WIN32
@@ -30,7 +30,7 @@
#ifndef __KX_TIME_CATEGORY_LOGGER_H
#define __KX_TIME_CATEGORY_LOGGER_H
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#endif
+1 -1
View File
@@ -30,7 +30,7 @@
#ifndef __KX_TIME_LOGGER_H
#define __KX_TIME_LOGGER_H
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
#endif
@@ -26,7 +26,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// don't show these anoying STL warnings
#pragma warning (disable:4786)
#endif
+1 -1
View File
@@ -30,7 +30,7 @@
#ifndef RAS_DEFORMER
#define RAS_DEFORMER
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
#endif //WIN32
@@ -29,7 +29,7 @@
#ifndef __RAS_IRASTERIZER
#define __RAS_IRASTERIZER
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786)
#endif
@@ -28,8 +28,11 @@
#include "RAS_MaterialBucket.h"
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786)
#endif
#ifdef WIN32
#include <windows.h>
#endif // WIN32
@@ -29,7 +29,7 @@
#ifndef __RAS_MESHOBJECT
#define __RAS_MESHOBJECT
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
// disable the STL warnings ("debug information length > 255")
#pragma warning (disable:4786)
#endif
@@ -29,7 +29,7 @@
#ifndef __RAS_OPENGLRASTERIZER
#define __RAS_OPENGLRASTERIZER
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786)
#endif
+1 -1
View File
@@ -26,7 +26,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
#ifdef WIN32
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786)
#endif