From aa6a5dcb6eb537ea847c3812a99b5320e183913a Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 21 Apr 2024 01:54:58 +0200
Subject: [PATCH] NetCon: rename to 'netcon'; remove platform suffix

Netcon is no longer 32bits. Previously it was made 32bits to maximize system compatibility, but this was unfortunately too hard to maintain after the migration to CMake, it was also no longer worth it as the tool never got used on 32bit platforms. Renamed to avoid confusion.
---
 r5dev/netconsole/CMakeLists.txt    | 7 ++-----
 r5dev/resource/batch/clean_sdk.bat | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/r5dev/netconsole/CMakeLists.txt b/r5dev/netconsole/CMakeLists.txt
index 7b6727ea..e978455b 100644
--- a/r5dev/netconsole/CMakeLists.txt
+++ b/r5dev/netconsole/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 3.16 )
-add_module( "exe" "netconsole" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
+add_module( "exe" "netcon" "vpc" ${FOLDER_CONTEXT} TRUE TRUE )
 
 start_sources()
 
@@ -31,11 +31,8 @@ add_sources( SOURCE_GROUP "Windows"
 
 end_sources( "${BUILD_OUTPUT_DIR}/bin/" )
 
-set_target_properties( ${PROJECT_NAME} PROPERTIES OUTPUT_NAME
-    "netcon32"
-)
 set_target_properties( ${PROJECT_NAME} PROPERTIES
-    VS_DEBUGGER_COMMAND "netcon32.exe"
+    VS_DEBUGGER_COMMAND "${PROJECT_NAME}.exe"
     VS_DEBUGGER_COMMAND_ARGUMENTS "-ansicolor"
     VS_DEBUGGER_WORKING_DIRECTORY "$(ProjectDir)../../../${BUILD_OUTPUT_DIR}/bin/"
 )
diff --git a/r5dev/resource/batch/clean_sdk.bat b/r5dev/resource/batch/clean_sdk.bat
index 2c1f1592..a3fe7ee4 100644
--- a/r5dev/resource/batch/clean_sdk.bat
+++ b/r5dev/resource/batch/clean_sdk.bat
@@ -17,6 +17,7 @@ del /Q "%~dp0..\r5apexsdkd64.dll"
 del /Q "%~dp0..\r5detours.dll"
 del /Q "%~dp0..\r5dev.dll"
 del /Q "%~dp0..\bin\naveditor.exe"
+del /Q "%~dp0..\bin\netcon32.exe"
 del /Q "%~dp0..\platform\cfg\englishclient_build_vpk.cfg"
 del /Q "%~dp0..\platform\cfg\englishclient_extract_vpk.cfg"
 del /Q "%~dp0..\platform\cfg\englishserver_build_vpk.cfg"