change build system, prepare for x64 someday

CMakeLists.txt

@@ -22,15 +22,12 @@ add_definitions(
   /DITH_HAS_CRT
 )
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Debug)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Release)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build)
 
 set(CMAKE_CONFIGURATION_TYPES Debug Release)
 
-add_subdirectory(texthook)
+add_subdirectory(host)
 add_subdirectory(vnrhook)
 add_subdirectory(GUI)

CMakeSettings.json

@@ -6,7 +6,7 @@
       "generator": "Ninja",
       "configurationType": "Debug",
       "inheritEnvironments": [ "msvc_x86" ],
-      "buildRoot": "${workspaceRoot}\\Builds\\${configurationType}",
+      "buildRoot": "${workspaceRoot}\\Builds\\${name}",
       "installRoot": "${workspaceRoot}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
       "cmakeCommandArgs": "",
       "buildCommandArgs": "-v",
@@ -17,7 +17,29 @@
       "generator": "Ninja",
       "configurationType": "Release",
       "inheritEnvironments": [ "msvc_x86" ],
-      "buildRoot": "${workspaceRoot}\\Builds\\${configurationType}",
+      "buildRoot": "${workspaceRoot}\\Builds\\${name}",
+      "installRoot": "${workspaceRoot}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": ""
+    },
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x86_x64" ],
+      "buildRoot": "${workspaceRoot}\\Builds\\${name}",
+      "installRoot": "${workspaceRoot}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": ""
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "inheritEnvironments": [ "msvc_x86_x64" ],
+      "buildRoot": "${workspaceRoot}\\Builds\\${name}",
       "installRoot": "${workspaceRoot}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
       "cmakeCommandArgs": "",
       "buildCommandArgs": "-v",

GUI/GUI.pro

@@ -39,7 +39,7 @@ FORMS += \
 	mainwindow.ui
 
 win32: LIBS += \
-	-L$$PWD/../Builds/Debug/Debug/ -lvnrhost
+	-L$$PWD/../Builds/x86-Debug/Build/ -lvnrhost
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

vnrhook/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(engine)
+project(vnrhook)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})