diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b3bb198..b11e3299 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ add_definitions(-D"VERSION=\\"${VERSION}\\"")
 # add client executable
 add_executable(${PROJECT_NAME} ${framework_SOURCES} ${client_SOURCES} ${executable_SOURCES})
 
-set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 11)
+set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 14)
 set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD_REQUIRED ON)
 
 target_link_libraries(${PROJECT_NAME} ${framework_LIBRARIES})
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 1eadc1e8..b8be2aa8 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -104,5 +104,7 @@ set(client_SOURCES ${client_SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/position.h
 )
 
-set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/luafunctions.cpp
-                            PROPERTIES LANGUAGE CXX COMPILE_FLAGS "-g0 -Os")
+if(NOT MSVC)
+    set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/luafunctions.cpp
+                                PROPERTIES LANGUAGE CXX COMPILE_FLAGS "-g0 -Os")
+endif()
diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
index 4e936e30..cb74320d 100644
--- a/src/framework/CMakeLists.txt
+++ b/src/framework/CMakeLists.txt
@@ -128,8 +128,10 @@ set(framework_SOURCES ${framework_SOURCES}
     ${CMAKE_CURRENT_LIST_DIR}/platform/platform.h
 )
 
-set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/luafunctions.cpp
-                            PROPERTIES LANGUAGE CXX COMPILE_FLAGS "-g0 -Os")
+if(NOT MSVC)
+    set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/luafunctions.cpp
+                                PROPERTIES LANGUAGE CXX COMPILE_FLAGS "-g0 -Os")
+endif()
 
 # some build options
 option(LUAJIT "Use lua jit" OFF)
diff --git a/src/framework/cmake/FindOgg.cmake b/src/framework/cmake/FindOgg.cmake
index 8105e473..f8b882b4 100644
--- a/src/framework/cmake/FindOgg.cmake
+++ b/src/framework/cmake/FindOgg.cmake
@@ -12,5 +12,5 @@ ELSE()
     FIND_LIBRARY(OGG_LIBRARY NAMES ${_OGG_SHARED_LIBS} ${_OGG_STATIC_LIBS})
 ENDIF()
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OGG DEFAULT_MSG OGG_LIBRARY OGG_INCLUDE_DIR)
-MARK_AS_ADVANCED(OGG_LIBRARY OGG_INCLUDE_DIR)
\ No newline at end of file
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ogg DEFAULT_MSG OGG_LIBRARY OGG_INCLUDE_DIR)
+MARK_AS_ADVANCED(OGG_LIBRARY OGG_INCLUDE_DIR)
diff --git a/src/framework/cmake/FindOpenAL.cmake b/src/framework/cmake/FindOpenAL.cmake
index a66f2573..14ac1b87 100644
--- a/src/framework/cmake/FindOpenAL.cmake
+++ b/src/framework/cmake/FindOpenAL.cmake
@@ -13,5 +13,5 @@ ELSE()
     FIND_LIBRARY(OPENAL_LIBRARY NAMES ${_OPENAL_SHARED_LIBS} ${_OPENAL_STATIC_LIBS} PATHS ${OPENAL_APPLE_PATHS})
 ENDIF()
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENAL DEFAULT_MSG OPENAL_LIBRARY OPENAL_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenAL DEFAULT_MSG OPENAL_LIBRARY OPENAL_INCLUDE_DIR)
 MARK_AS_ADVANCED(OPENAL_LIBRARY OPENAL_INCLUDE_DIR)
diff --git a/src/framework/cmake/FindOpenSSL.cmake b/src/framework/cmake/FindOpenSSL.cmake
index d1ec41b0..68b3da5f 100644
--- a/src/framework/cmake/FindOpenSSL.cmake
+++ b/src/framework/cmake/FindOpenSSL.cmake
@@ -17,5 +17,5 @@ ELSE()
 ENDIF()
 SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENSSL DEFAULT_MSG OPENSSL_LIBRARIES OPENSSL_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenSSL DEFAULT_MSG OPENSSL_LIBRARIES OPENSSL_INCLUDE_DIR)
 MARK_AS_ADVANCED(OPENSSL_LIBRARIES OPENSSL_LIBRARY OPENSSL_CRYPTO_LIBRARY OPENSSL_INCLUDE_DIR)
diff --git a/src/framework/cmake/FindPhysFS.cmake b/src/framework/cmake/FindPhysFS.cmake
index 12ee3d4a..76a04967 100644
--- a/src/framework/cmake/FindPhysFS.cmake
+++ b/src/framework/cmake/FindPhysFS.cmake
@@ -12,5 +12,5 @@ ELSE()
     FIND_LIBRARY(PHYSFS_LIBRARY NAMES ${_PHYSFS_SHARED_LIBS} ${_PHYSFS_STATIC_LIBS})
 ENDIF()
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(PHYSFS DEFAULT_MSG PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR)
-MARK_AS_ADVANCED(PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR)
\ No newline at end of file
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PhysFS DEFAULT_MSG PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR)
+MARK_AS_ADVANCED(PHYSFS_LIBRARY PHYSFS_INCLUDE_DIR)
diff --git a/src/framework/cmake/FindVorbis.cmake b/src/framework/cmake/FindVorbis.cmake
index bc2e16de..d4c07e8f 100644
--- a/src/framework/cmake/FindVorbis.cmake
+++ b/src/framework/cmake/FindVorbis.cmake
@@ -12,5 +12,5 @@ ELSE()
     FIND_LIBRARY(VORBIS_LIBRARY NAMES ${_VORBIS_SHARED_LIBS} ${_VORBIS_STATIC_LIBS})
 ENDIF()
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBIS DEFAULT_MSG VORBIS_LIBRARY VORBIS_INCLUDE_DIR)
-MARK_AS_ADVANCED(VORBIS_LIBRARY VORBIS_INCLUDE_DIR)
\ No newline at end of file
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Vorbis DEFAULT_MSG VORBIS_LIBRARY VORBIS_INCLUDE_DIR)
+MARK_AS_ADVANCED(VORBIS_LIBRARY VORBIS_INCLUDE_DIR)
diff --git a/src/framework/cmake/FindVorbisFile.cmake b/src/framework/cmake/FindVorbisFile.cmake
index 5e1da5b5..21a5d40a 100644
--- a/src/framework/cmake/FindVorbisFile.cmake
+++ b/src/framework/cmake/FindVorbisFile.cmake
@@ -12,5 +12,5 @@ ELSE()
     FIND_LIBRARY(VORBISFILE_LIBRARY NAMES ${_VORBISFILE_SHARED_LIBS} ${_VORBISFILE_STATIC_LIBS})
 ENDIF()
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VORBISFILE DEFAULT_MSG VORBISFILE_LIBRARY VORBISFILE_INCLUDE_DIR)
-MARK_AS_ADVANCED(VORBISFILE_LIBRARY VORBISFILE_INCLUDE_DIR)
\ No newline at end of file
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(VorbisFile DEFAULT_MSG VORBISFILE_LIBRARY VORBISFILE_INCLUDE_DIR)
+MARK_AS_ADVANCED(VORBISFILE_LIBRARY VORBISFILE_INCLUDE_DIR)