Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- 'extern "C"' fix for MSVC as suggested by Stephane

Browse Source
This commit is contained in:
Nils Thuerey
2005-11-24 12:42:33 +00:00
parent fde3718843
commit 006e9547a9
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/elbeem/intern/utilities.cpp
View File

@@ -26,13 +26,11 @@
#include "SDL.h"
#include "SDL_thread.h"
#include "SDL_mutex.h"
extern "C" {
void simulateThreadIncreaseFrame(void);
}
extern SDL_mutex *globalBakeLock;
extern "C" void simulateThreadIncreaseFrame(void);
extern "C" SDL_mutex *globalBakeLock;
// global state variables
extern int globalBakeState;
extern int globalBakeFrame;
extern "C" int globalBakeState;
extern "C" int globalBakeFrame;
#endif // ELBEEM_BLENDER==1
#include "utilities.h"

6
intern/elbeem/intern/utilities.h
View File

@@ -34,7 +34,7 @@ int getGlobalBakeState(void);
#else // ELBEEM_BLENDER
#define DEBUG 10
#endif // ELBEEM_BLENDER
extern int gDebugLevel;
extern "C" int gDebugLevel;
// state of the simulation world
// default
@@ -48,9 +48,9 @@ extern int gDebugLevel;
// general error
#define SIMWORLD_GENERICERROR -3
// global world state
extern int gElbeemState;
extern "C" int gElbeemState;
// last error as string
extern char gElbeemErrorString[];
extern "C" char gElbeemErrorString[];
// check world status macro
#define SIMWORLD_OK() (gElbeemState>=0)