From 08ee65c3c88503701595a9a19a4fdf915050be30 Mon Sep 17 00:00:00 2001
From: Michael Pavlyshko <me@mixaill.tk>
Date: Thu, 10 Jul 2014 01:06:37 +0300
Subject: [PATCH] fix .dll and .exe filenames

---
 CMakeLists.txt        | 3 ++-
 client/CMakeLists.txt | 4 ++++
 server/CMakeLists.txt | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ef343403..e8e3bab83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,7 @@ if (WIN32)
 	add_definitions(-D_WIN32_WINNT=0x0501)
 	set(SYSTEM_LIBS ${SYSTEM_LIBS} ole32 oleaut32 ws2_32 mswsock)
 	set(SYSTEM_LIBS ${SYSTEM_LIBS} iconv)
+	set(CMAKE_SHARED_LIBRARY_PREFIX "") #delete lib prefix for dlls
 endif()
 
 if(APPLE)
@@ -125,7 +126,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR NOT WIN32) #so far all *nix compilers support suc
 	if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 		set(CLANG_SPECIFIC_FLAGS "-Wno-mismatched-tags")
 	endif()
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -Wextra -Wpointer-arith -Wno-switch -Wno-sign-compare -Wno-unused-parameter -Wuninitialized -Wno-overloaded-virtual ${CLANG_SPECIFIC_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ${CLANG_SPECIFIC_FLAGS}")
 
 	if(UNIX)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 2a581c7b4..b1cb9d368 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -101,6 +101,10 @@ else()
 	add_executable(vcmiclient ${client_SRCS})
 endif()
 
+if(WIN32)
+	set_target_properties(vcmiclient PROPERTIES OUTPUT_NAME VCMI_client)
+endif()
+
 target_link_libraries(vcmiclient vcmi ${Boost_LIBRARIES} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLTTF_LIBRARY} ${ZLIB_LIBRARIES} ${FFMPEG_LIBRARIES} ${SYSTEM_LIBS})
 
 set_target_properties(vcmiclient PROPERTIES ${PCH_PROPERTIES})
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 09bd9be44..db44bca27 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -16,6 +16,10 @@ add_executable(vcmiserver ${server_SRCS})
 
 target_link_libraries(vcmiserver vcmi ${Boost_LIBRARIES} ${SYSTEM_LIBS})
 
+if(WIN32)
+	set_target_properties(vcmiserver PROPERTIES OUTPUT_NAME VCMI_server)
+endif()
+
 set_target_properties(vcmiserver PROPERTIES ${PCH_PROPERTIES})
 set_target_properties(vcmiserver PROPERTIES XCODE_ATTRIBUTE_LD_RUNPATH_SEARCH_PATHS "@executable_path/../Frameworks @executable_path/")
 cotire(vcmiserver)