Support for building bf-blender under windows with gcc (huge thanks to
Florian Eggenburger). Full instructions are in doc/README.windows-gcc. Main differences from Florian's patch: - the 'lib' dir should now be the same level as the 'blender' dir (rather than being a subdir of 'blender'). This is consistent with the other platforms that bf-blender supports (tuhopuu will also adopt this convention hopefully soon). - the script 'free_windows-env.mk' is no longer needed ... see the docs about how this is overcome (again, tuhopuu will hopefully also follow this route soon). - the dlltool dir has it's own Makefile that builds all of the needed stub libraries from the dll's in cvs.
This commit is contained in:
@@ -39,7 +39,7 @@ typedef unsigned short GHOST_TUns16;
|
||||
typedef int GHOST_TInt32;
|
||||
typedef unsigned int GHOST_TUns32;
|
||||
|
||||
#ifdef WIN32
|
||||
#if defined(WIN32) && !defined(FREE_WINDOWS)
|
||||
typedef __int64 GHOST_TInt64;
|
||||
typedef unsigned __int64 GHOST_TUns64;
|
||||
#else
|
||||
|
@@ -47,7 +47,9 @@
|
||||
// We do not support multiple monitors at the moment
|
||||
#include <windows.h>
|
||||
#define COMPILE_MULTIMON_STUBS
|
||||
#ifndef FREE_WINDOWS
|
||||
#include <multimon.h>
|
||||
#endif
|
||||
|
||||
|
||||
GHOST_DisplayManagerWin32::GHOST_DisplayManagerWin32(void)
|
||||
|
@@ -317,7 +317,11 @@ GHOST_TSuccess GHOST_SystemWin32::init()
|
||||
wc.cbClsExtra= 0;
|
||||
wc.cbWndExtra= 0;
|
||||
wc.hInstance= ::GetModuleHandle(0);
|
||||
wc.hIcon = ::LoadIcon(wc.hInstance, "APPICON");
|
||||
#ifndef FREE_WINDOWS
|
||||
wc.hIcon = ::LoadIcon(wc.hInstance, "APPICON");
|
||||
#else
|
||||
wc.hIcon = ::LoadIcon(NULL, "APPICON");
|
||||
#endif
|
||||
if (!wc.hIcon) {
|
||||
::LoadIcon(NULL, IDI_APPLICATION);
|
||||
}
|
||||
@@ -466,6 +470,7 @@ GHOST_EventCursor* GHOST_SystemWin32::processCursorEvent(GHOST_TEventType type,
|
||||
{
|
||||
GHOST_TInt32 x, y;
|
||||
getSystem()->getCursorPosition(x, y);
|
||||
printf("%d %d\n",x,y);
|
||||
return new GHOST_EventCursor (getSystem()->getMilliSeconds(), type, window, x, y);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user