#
IF( WIN32_STYLE_FIND )
- #DFCH: If x64 architecture
- IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+# EED 31 jan 2013
+# IF( WXWIDGETS_USE_SHARED )
+# SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_dll" )
+# ELSE( WXWIDGETS_USE_SHARED )
+# SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_lib" )
+# ENDIF( WXWIDGETS_USE_SHARED )
+
+ IF (CMAKE_CL_64) ## EED 31 jan 2012
IF( WXWIDGETS_USE_SHARED )
SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_amd64_dll" )
ELSE( WXWIDGETS_USE_SHARED )
- SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_amd64_lib" )
+ SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_amd_lib" )
ENDIF( WXWIDGETS_USE_SHARED )
- ELSE (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ ELSE(CMAKE_CL_64)
IF( WXWIDGETS_USE_SHARED )
SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_dll" )
ELSE( WXWIDGETS_USE_SHARED )
SET(WXWIDGETS_LIB_PATH "${WXWIDGETS_ROOT_DIR}/lib/vc_lib" )
ENDIF( WXWIDGETS_USE_SHARED )
- ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+ ENDIF(CMAKE_CL_64)
+
SET( WXWIDGETS_LINK_DIRECTORIES ${WXWIDGETS_LIB_PATH} )
+
ELSE( WIN32_STYLE_FIND )
IF (UNIX_STYLE_FIND)