Add WinDDK x64 libraries

StepmaniaCore.cmake

@@ -153,6 +153,12 @@ check_type_size(pid_t SIZEOF_PID_T)
 check_type_size(size_t SIZEOF_SIZE_T)
 check_type_size(ssize_t SIZEOF_SSIZE_T)
 
+if(WIN32 AND SIZEOF_INTPTR_T EQUAL 8)
+  set(SM_WIN32_ARCH "x64")
+else()
+  set(SM_WIN32_ARCH "x86")
+endif()
+
 include(TestBigEndian)
 test_big_endian(BIGENDIAN)
 if(${BIGENDIAN})
@@ -280,11 +286,6 @@ if(WIN32)
     set(HAS_FFMPEG TRUE)
   else()
     # FFMPEG...it can be evil.
-    if(SIZEOF_INTPTR_T EQUAL 8)
-      set(SM_WIN32_ARCH "x64")
-    else()
-      set(SM_WIN32_ARCH "x86")
-    endif()
     find_library(LIB_SWSCALE
                  NAMES "swscale"
                  PATHS "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib"

extern/CMakeProject-mad.cmake

@@ -62,7 +62,7 @@ else()
     # first glance.
     sm_add_compile_definition("mad" ASO_ZEROCHECK)
     sm_add_compile_definition("mad" $<$<CONFIG:Debug>:FPM_DEFAULT>)
-    if(SIZEOF_INTPTR_T EQUAL 8)
+    if(SM_WIN32_ARCH EQUAL "x64")
       sm_add_compile_definition("mad" $<$<CONFIG:Release>:FPM_64BIT>)
       sm_add_compile_definition("mad" $<$<CONFIG:MinSizeRel>:FPM_64BIT>)
       sm_add_compile_definition("mad" $<$<CONFIG:RelWithDebInfo>:FPM_64BIT>)

src/CMakeLists.txt

@@ -486,7 +486,7 @@ if(WIN32)
   sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${DIRECTX_LIBRARY_DIR}\"")
   sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib\"")
   sm_add_link_flag("${SM_EXE_NAME}"
-                   "/LIBPATH:\"${SM_SRC_DIR}/archutils/Win32/ddk\"")
+                   "/LIBPATH:\"${SM_SRC_DIR}/archutils/Win32/ddk/${SM_WIN32_ARCH}\"")
   sm_add_link_flag("${SM_EXE_NAME}" "/ERRORREPORT:SEND")
   sm_add_link_flag("${SM_EXE_NAME}" "/MAPINFO:EXPORTS")
   sm_add_link_flag("${SM_EXE_NAME}" "/SAFESEH:NO")