Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Want <cwant@ualberta.ca>2003-05-25 00:04:37 +0400
committerChris Want <cwant@ualberta.ca>2003-05-25 00:04:37 +0400
commit924a8497551be7d83bb577e94ebf89b18374b874 (patch)
tree5912852343da88dcc863a56ab641e60983a5432b /intern/ghost
parent94c4250d9f7ca57d9af7a7265fcdec0b4e94e5b3 (diff)
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.
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/GHOST_Types.h2
-rw-r--r--intern/ghost/intern/GHOST_DisplayManagerWin32.cpp2
-rw-r--r--intern/ghost/intern/GHOST_SystemWin32.cpp7
3 files changed, 9 insertions, 2 deletions
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index a7c89c7e0a6..f4649a9574b 100644
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -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
diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
index 0e5e82f1f11..3fbacfb1db8 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
@@ -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)
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 3d9943a5c8c..d1242198d4e 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -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);
}