fix #includes for GPU debug
Can now build release and debug. Close to final version in master (which took several commits).
This commit is contained in:
parent
b8f27b2514
commit
b92d76000d
|
@ -21,15 +21,14 @@
|
|||
#ifndef __BLI_SYSTEM_H__
|
||||
#define __BLI_SYSTEM_H__
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
/** \file BLI_system.h
|
||||
* \ingroup bli
|
||||
*/
|
||||
|
||||
int BLI_cpu_support_sse2(void);
|
||||
|
||||
#if defined(NDEBUG) || !defined(__BLI_UTILDEFINES_H__)
|
||||
void BLI_system_backtrace(FILE *fp);
|
||||
#endif
|
||||
|
||||
/* getpid */
|
||||
#ifdef WIN32
|
||||
|
|
|
@ -633,7 +633,7 @@ extern bool BLI_memory_is_zero(const void *arr, const size_t arr_size);
|
|||
* for aborting need to define WITH_ASSERT_ABORT
|
||||
*/
|
||||
#ifndef NDEBUG
|
||||
extern void BLI_system_backtrace(FILE *fp);
|
||||
# include "BLI_system.h"
|
||||
# ifdef WITH_ASSERT_ABORT
|
||||
# define _BLI_DUMMY_ABORT abort
|
||||
# else
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_system.h"
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
|
|
@ -34,8 +34,6 @@
|
|||
|
||||
#include "GPU_glew.h"
|
||||
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
|
|
@ -29,7 +29,9 @@
|
|||
* \ingroup gpu
|
||||
*/
|
||||
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_sys_types.h"
|
||||
#include "BLI_system.h"
|
||||
|
||||
#include "BKE_global.h"
|
||||
|
||||
|
|
Loading…
Reference in New Issue