3 files changed, 21 insertions, 5 deletions
diff --git a/src/mir_app/CMakeLists.txt b/src/mir_app/CMakeLists.txt
index 8e72c06f59..fa73635191 100644
--- a/src/mir_app/CMakeLists.txt
+++ b/src/mir_app/CMakeLists.txt
@@ -1,4 +1,9 @@
-file(GLOB SOURCES "src/*.h" "src/*.cpp" "src/mir_app.def" "res/*.rc")
+file(GLOB SOURCES "src/*.h" "src/*.cpp" "res/*.rc")
+if(CMAKE_CL_64)
+	list(APPEND SOURCES "src/mir_app64.def")
+else()
+	list(APPEND SOURCES "src/mir_app.def")
+endif()
 set(TARGET mir_app)
 include(${CMAKE_SOURCE_DIR}/cmake/lib.cmake)
 
diff --git a/src/mir_core/CMakeLists.txt b/src/mir_core/CMakeLists.txt
index aaaacf1312..d9ad3b5ba2 100644
--- a/src/mir_core/CMakeLists.txt
+++ b/src/mir_core/CMakeLists.txt
@@ -1,5 +1,11 @@
-file(GLOB SOURCES "src/*.h" "src/*.cpp" "src/mir_core.def")
+file(GLOB SOURCES "src/*.h" "src/*.cpp")
+if(CMAKE_CL_64)
+	list(APPEND SOURCES "src/mir_core64.def")
+else()
+	list(APPEND SOURCES "src/mir_core.def")
+endif()
 set(TARGET mir_core)
 include(${CMAKE_SOURCE_DIR}/cmake/lib.cmake)
 
-set_target_properties(${TARGET} PROPERTIES COMPILE_DEFINITIONS "MIR_CORE_EXPORTS")
-\ No newline at end of file
+set_target_properties(${TARGET} PROPERTIES COMPILE_DEFINITIONS "MIR_CORE_EXPORTS")
+add_custom_command(TARGET ${TARGET} PRE_BUILD COMMAND "${CMAKE_SOURCE_DIR}/build/make_ver.bat")
+\ No newline at end of file
diff --git a/src/miranda32/CMakeLists.txt b/src/miranda32/CMakeLists.txt
index 1ca94b3a1d..2375cb76d6 100644
--- a/src/miranda32/CMakeLists.txt
+++ b/src/miranda32/CMakeLists.txt
@@ -1,7 +1,12 @@
 file(GLOB SOURCES "src/*.h" "src/*.cpp" "res/*.rc")
-add_executable(miranda32 ${SOURCES})
+if(CMAKE_CL_64)
+	set(TARGET "Miranda64")
+else()
+	set(TARGET "Miranda32")
+endif()
+add_executable(${TARGET} ${SOURCES})
 include_directories(.)
-set_target_properties(miranda32 PROPERTIES
+set_target_properties(${TARGET} PROPERTIES
 	LINK_FLAGS "/SUBSYSTEM:WINDOWS"
 	RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/$<CONFIG>"
 )
 \ No newline at end of file