Removed old projects and build settings

Updated readme with new win32 build output
Fixed a couple of glitches in cmake config files

CMakeLists.txt

@@ -301,10 +301,6 @@ if(NOT BUILD_ONLY_CEF)
     add_subdirectory(third_party/npwrapper)
   endif()
 
-  if(WIN32)
-    add_subdirectory(third_party/desura_extra)
-  endif()
-
   ###############################################################################
   # build desura
   ###############################################################################

README.md

@@ -83,11 +83,11 @@ Build Desura on Windows
 Download and install:
 
  * Svn http://www.sliksvn.com/en/download or http://tortoisesvn.net/downloads.html
- * Msvc 2012 or higher
+ * Msvc 2013 or higher (as C++11 features are in use)
  * Python 2.7 http://www.python.org/getit/
  * CMake 2.8 http://www.cmake.org/
  * Patch either from msysGit or git bash
- * Windows DirectX 9 SDK for the CEF build https://www.microsoft.com/en-us/download/details.aspx?id=6812
+ * (Optional) Windows DirectX 9 SDK for the CEF build https://www.microsoft.com/en-us/download/details.aspx?id=6812
 
 Note: Make sure you add svn and python to your environment PATH
 
@@ -108,9 +108,9 @@ Open a 32bit cmd.exe with env vars set up by vc or other scripts (so we have a f
 
 * Set BUILD_ALL as startup project
 * In properties for BUILD_ALL set debugging options:
- * Command to source code dir + "\build_out\desura.exe"
- * Working Directory to source code dir + "\build_out"
-* Build ThirdParty folder first (race condition some times if you dont
+ * Command to source code dir + "\build_vis\Debug_Out\desura.exe"
+ * Working Directory to source code dir + "\build_vis\Debug_Out"
+* Build ThirdParty folder first (race condition some times if you dont)
 * Build BUILD_ALL
 
 Should be able to run and debug Desura now.

build_desura_vis.bat

@@ -3,6 +3,6 @@ IF NOT EXIST build_vis (
 )
 
 cd build_vis
-cmake .. -DCMAKE_INSTALL_PREFIX=../install_vis -G "Visual Studio 10" -DBUILD_CEF=OFF -DDEBUG=ON -DBUILD_TESTS=OFF -DBUILD_TESTING=OFF -DDEBUG_V8=ON
+cmake .. -DCMAKE_INSTALL_PREFIX=../install_vis -G "Visual Studio 12" -DBUILD_CEF=OFF -DDEBUG=ON -DBUILD_TESTS=OFF -DBUILD_TESTING=OFF -DDEBUG_V8=ON
 start Desura.sln
 cd ..

cmake/modules/BuildCURL.cmake

@@ -70,6 +70,8 @@ if(WIN32 AND NOT MINGW)
     source_dir
   )
 
+  set_property(TARGET curl_s PROPERTY FOLDER "ThirdParty")
+
   if(DEBUG)
     set(CURL_INSTALL_DIR_S ${source_dir}/builds/libcurl-vc-x86-debug-static-sspi-winssl)
   else()

cmake/modules/BuildDesuraExtraBin.cmake

@@ -1,7 +1,7 @@
 ExternalProject_Add(
   desura_extra_bin
-  URL "${DESURA_EXTRA_BIN}"
-  URL_MD5 ${DESURA_EXTRA_BIN}
+  URL "${DESURA_EXTRA_BIN_URL}"
+  URL_MD5 ${DESURA_EXTRA_BIN_MD5}
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   INSTALL_COMMAND ""

cmake/modules/SetInstallPaths.cmake

@@ -14,9 +14,9 @@ set(CMAKE_INSTALL_PREFIX ${DEFAULT_INSTALL_DIR}
     CACHE STRING "Desura Install Prefix")
 
 if(WIN32)
-  set(BINDIR "")
-  set(RUNTIME_LIBDIR "bin")
-  set(DATADIR "data")
+  set(BINDIR "${CMAKE_BUILD_TYPE}_Out")
+  set(RUNTIME_LIBDIR "${BINDIR}\\bin")
+  set(DATADIR "${BINDIR}\\data")
 else()
   set(BINDIR ""
       CACHE STRING "Desura Bin Install Dir")

src/CMakeLists.txt

@@ -122,8 +122,6 @@ endif()
 option(BUILD_TOOLS "Build various Desura tools." ON)
 
 if(BUILD_TOOLS)
-  add_subdirectory(tools/mcf_upload_cli)
-  add_subdirectory(tools/mcf_extract)
   add_subdirectory(tools/mcf_util)
 endif()
 

src/executable/dumpgen_win/CMakeLists.txt

@@ -21,4 +21,4 @@ target_link_libraries(dumpgen
 )
 SetStaticRuntime(dumpgen)
 
-install_tool(dumpgen)
+install_executable(dumpgen)