diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-13 18:06:53 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-13 18:06:53 -0300 |
| commit | b607687a3182ef2fa9955d71abe86b31bdc1f99f (patch) | |
| tree | 388b6fa3c4ee2a38114208d8f8faab751ae23361 /platform | |
| parent | 58cda02a389759d18176216c06f375d364cefef1 (diff) | |
| parent | 4ff524b5c9227d0eeae2a8d9761add7465c03710 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/os_osx.mm | 4 | ||||
| -rw-r--r-- | platform/windows/detect.py | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 5be46e4843..c692a296e5 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -378,8 +378,8 @@ static int button_mask=0; prev_mouse_y=mouse_y; const NSRect contentRect = [OS_OSX::singleton->window_view frame]; const NSPoint p = [event locationInWindow]; - mouse_x = p.x; - mouse_y = contentRect.size.height - p.y; + mouse_x = p.x * [[event window] backingScaleFactor]; + mouse_y = (contentRect.size.height - p.y) * [[event window] backingScaleFactor]; ev.mouse_motion.x=mouse_x; ev.mouse_motion.y=mouse_y; ev.mouse_motion.global_x=mouse_x; diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 490f048f26..b8b0509da7 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -84,6 +84,7 @@ def configure(env): env.Append(CCFLAGS=['/O2'])
env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
+ env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
elif (env["target"]=="test"):
@@ -92,8 +93,9 @@ def configure(env): elif (env["target"]=="debug"):
- env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DD3D_DEBUG_INFO','/O1'])
+ env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DD3D_DEBUG_INFO','/O1'])
env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
+ env.Append(LINKFLAGS=['/DEBUG'])
elif (env["target"]=="profile"):
@@ -113,8 +115,7 @@ def configure(env): env.Append(CCFLAGS=['/DGLES1_ENABLED'])
env.Append(CCFLAGS=['/DGLEW_ENABLED'])
env.Append(LIBS=['winmm','opengl32','dsound','kernel32','ole32','user32','gdi32','wsock32'])
- env.Append(LINKFLAGS=['/DEBUG'])
-
+
env.Append(LIBPATH=[os.getenv("WindowsSdkDir")+"/Lib"])
if (os.getenv("DXSDK_DIR")):
DIRECTX_PATH=os.getenv("DXSDK_DIR")
|