add 64bit build support for windows

Pretty minimal, tested on vs2010. requires cmake 2.8.4 because of this bug: http://www.vtk.org/Bug/view.php?id=11464
firebreath · Jun 1, 2011 · d46b335 · d46b335
1 parent 0a61b03
commit d46b335
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/cmake/Win.cmake b/cmake/Win.cmake
@@ -82,13 +82,17 @@ if (NOT ATL_INCLUDE_DIR)
     NO_DEFAULT_PATH
     )
 
-    find_file(ATLLIB
-        atls.lib
-    PATHS
-        ${VC_DIR}/atlmfc/lib
-        ${ATLLIB_GUESSES}
-    NO_DEFAULT_PATH
-    )
+	if (CMAKE_SIZEOF_VOID_P EQUAL 8)		
+		set(ATLLIB_GUESSES "${VC_DIR}/atlmfc/lib/amd64" ${ATLLIB_GUESSES})
+	else()
+		set(ATLLIB_GUESSES "${VC_DIR}/atlmfc/lib" ${ATLLIB_GUESSES})
+	endif()
+	find_file(ATLLIB
+		atls.lib
+	PATHS
+		${ATLLIB_GUESSES}
+		NO_DEFAULT_PATH
+	)
 
     find_file(MFCWIN
         winres.h

diff --git a/cmake/buildconfig.cmake b/cmake/buildconfig.cmake
@@ -22,8 +22,14 @@ if (WIN32)
     set(CMAKE_CXX_FLAGS                          "/DWIN32 /DFB_WIN=1 /DXP_WIN=1 /W3 /wd4996 /nologo /EHsc /wd4290 /D UNICODE /D _UNICODE /D _WINDOWS")
     set(CMAKE_C_FLAGS_RELEASE                    "/MT /Ox /DNDEBUG")
     set(CMAKE_CXX_FLAGS_RELEASE                  "/MT /Ox /DNDEBUG")
-    set(CMAKE_C_FLAGS_DEBUG                      "/MTd /Od /DDEBUG /D_DEBUG /ZI /RTC1 /Gm")
-    set(CMAKE_CXX_FLAGS_DEBUG                    "/MTd /Od /DDEBUG /D_DEBUG /ZI /RTC1 /Gm")
+	# x64 does not support edit-and-continue.
+	if (CMAKE_SIZEOF_VOID_P EQUAL 8)		
+		set(CMAKE_C_FLAGS_DEBUG                      "/MTd /Od /DDEBUG /D_DEBUG /Zi /RTC1 /Gm")	
+		set(CMAKE_CXX_FLAGS_DEBUG                    "/MTd /Od /DDEBUG /D_DEBUG /Zi /RTC1 /Gm")
+	else()
+		set(CMAKE_C_FLAGS_DEBUG                      "/MTd /Od /DDEBUG /D_DEBUG /ZI /RTC1 /Gm")	
+		set(CMAKE_CXX_FLAGS_DEBUG                    "/MTd /Od /DDEBUG /D_DEBUG /ZI /RTC1 /Gm")
+	endif()
     set(CMAKE_C_FLAGS_MINSIZEREL                 "/MT /O1 /DNDEBUG")
     set(CMAKE_CXX_FLAGS_MINSIZEREL               "/MT /O1 /DNDEBUG")
     set(CMAKE_C_FLAGS_RELWITHDEBINFO             "/MT /Ox /DNDEBUG /Zi")

diff --git a/prep2008x64.cmd b/prep2008x64.cmd
@@ -0,0 +1,7 @@
+@echo off & setlocal enableextensions enabledelayedexpansion
+
+set _FB_GEN="Visual Studio 9 2008 Win64"
+
+call "%~d0%~p0\common.cmd" %*
+if %errorlevel% == 2 exit /b 1
+call "%~d0%~p0\winprep.cmd"
diff --git a/prep2010x64.cmd b/prep2010x64.cmd
@@ -0,0 +1,7 @@
+@echo off & setlocal enableextensions enabledelayedexpansion
+
+set _FB_GEN="Visual Studio 10 Win64"
+
+call "%~d0%~p0\common.cmd" %*
+if %errorlevel% == 2 exit /b 1
+call "%~d0%~p0\winprep.cmd"
diff --git a/src/ActiveXCore/FBControl.h b/src/ActiveXCore/FBControl.h
@@ -221,7 +221,7 @@ namespace FB {
         HRESULT FB::ActiveX::CFBControl<pFbCLSID, pMT, ICurObjInterface, piid, plibid>::OnDraw( ATL_DRAWINFO& di )
         {
             if (pluginWin && m_bWndLess && FB::pluginGuiEnabled()) {
-                HRESULT lRes(0);
+                LRESULT lRes(0);
                 PluginWindowlessWin* win = static_cast<PluginWindowlessWin*>(pluginWin.get());
                 win->setWindowPosition(
                     di.prcBounds->left,