diff --git a/lime/tools/platforms/WindowsPlatform.hx b/lime/tools/platforms/WindowsPlatform.hx
index f467f0f08..090fc6052 100644
--- a/lime/tools/platforms/WindowsPlatform.hx
+++ b/lime/tools/platforms/WindowsPlatform.hx
@@ -267,7 +267,19 @@ class WindowsPlatform extends PlatformTarget {
 			
 		}
 		
-		CPPHelper.rebuild (project, [[ "-Dwindows" ]]);
+		var commands = [];
+		
+		if (targetFlags.exists ("64")) {
+			
+			commands.push ([ "-Dwindow", "-DHXCPP_M64" ]);
+			
+		} else {
+			
+			commands.push ([ "-Dwindow", "-DHXCPP_M32" ]);
+			
+		}
+		
+		CPPHelper.rebuild (project, commands);
 		
 	}
 	
diff --git a/project/src/backend/sdl/SDLWindow.cpp b/project/src/backend/sdl/SDLWindow.cpp
index 0a2e9f4bb..9a109f667 100644
--- a/project/src/backend/sdl/SDLWindow.cpp
+++ b/project/src/backend/sdl/SDLWindow.cpp
@@ -136,7 +136,7 @@ namespace lime {
 				HWND hwnd = wminfo.info.win.window;
 				
 				#ifdef _WIN64
-				::SetClassLongPtr (hwnd, GCLP_HICON, reinterpret_cast<LONG>(icon));
+				::SetClassLongPtr (hwnd, GCLP_HICON, reinterpret_cast<LONG_PTR>(icon));
 				#else
 				::SetClassLong (hwnd, GCL_HICON, reinterpret_cast<LONG>(icon));
 				#endif