Update CLion and MSVC6 build instructions for new CMake configuration

Author: DevGeniusCode

SourceCode/Builds/build_with_clion_vc6_toolchain.md

@@ -5,23 +5,23 @@
 1. **CLion** installed and configured.
 2. **Microsoft Visual C++ 6.0 (VC6)** installed (assuming it’s installed in the
    default directory).
-3. **CMake** installed and configured.
-4. **Source code** of the project cloned from the TheSuperHackers repository.
+3. **Source code** of the project cloned from the TheSuperHackers repository.
 
 ## Step 1: Setting Up the Toolchain in CLion
 
-1. Open **CLion** and go to **File** -> **Settings** -> **Build, Execution,
+1. Open the cloned folder in **CLion** and go to **File** -> **Settings** -> **Build, Execution,
    Deployment** -> **Toolchains**.
 2. Add a new **Toolchain** by clicking the **+** button.
 3. Select **System** as the Type (not Visual Studio).
-4. Next to the toolchain name, add the **environment** file by clicking the
+4. Rename the toolchain to **Visual Studio 6**
+5. Next to the toolchain name, add the **environment** file by clicking the
    **+** button and pointing to the following file:
 
    ```text
    C:\Program Files (x86)\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT
    ```
 
-5. Set the paths for the tools:
+6. Set the paths for the tools:
     - **Build Tool**: Choose the `NMAKE.EXE` file from VC6. For example:
 
       ```text
@@ -39,39 +39,31 @@
 
 ## Step 2: Configuring the CMake Profile
 
-1. Go to **File** -> **Settings** -> **Build, Execution, Deployment** -> **CMake**.
-2. In this window, select the CMake profile you want to configure (if there
-   isn’t one, create a new one).
-3. Choose the **Toolchain** you created in the previous step (VC6 Toolchain).
-4. Choose the **Generator** as `NMake Makefiles`.
-5. Under **CMake options**, add the following generate settings:
+1. In Cmake profiles, enable the profiles you want to use, like vc6, vc6dgb, vc6int, vc6prof.
 
-   ```text
-      -G "NMake Makefiles"
-   ```
+## step 3: Configuring the installation path
 
-   Be careful not to set `Preset`, as it will override the generator settings.
-6. Add the build directory path under **CMake Build Directory**:
+1. In the target application options, do the following:
 
-   ```text
-   C:\Users\User\Documents\CLion\CnC_Generals_Zero_Hour\build\vc6
-   ```
+- Set Program arguments with your favorite arguments,like `-win, -quickstart, -nologo`.
+- Set Working directory to the game directory.
+- Check the run as administrator option.
+- In 'Before launch' section, add a new 'install' step.
+- To avoid duplication build, remove the 'Build' step.
+- Save the configuration, and you are ready to build and run the project.
 
-## Step 3: Compiling and Running the Project
+## Step 4: Compiling and Running the Project
 
-1. Now, click the **Build** button in CLion.
-2. CLion will start the build process using the VC6 (x86) toolchain.
-3. Once the build is successfully completed, a **zerohour.exe** file will be generated.
-4. You need to copy the **zerohour.exe** file to the appropriate game directory in order to run the game.
+1. Now, click the **Build** button in CLion, or click **Install** in build menu.
+2. CLion will start the build/install process using the VC6 (x86) toolchain.
+3. Once the build is successfully completed, a executable file will be generated (and installed in the game directory).
 
 ---
 
 ## Notes
 
-- **Visual C++ 6.0 (VC6)** only supports C++98, so avoid using modern C++ features.
 - Working with VC6 requires some adjustments, so it’s always a good idea to check
-  that the toolchain is working
-  properly.
+  that the toolchain is working properly.
 - You can add Release and Debug profiles in CLion to build the project in
   different configurations.
-- Admin rights might be required to run VC6 tools, so make sure to run CLion as an administrator.
+- Admin rights might be required to run VC6 tools, so make sure to run CLion as an administrator if needed.

SourceCode/Builds/build_with_msvc6.md

@@ -52,23 +52,19 @@ Installation of tools and software that are needed for compilation.
 
 ## Clone
 
-> **_NOTE:_**  The source code you clone is from the WIP from OmniBlade.
+Clone the code from TheSuperHackers
 
-Clone the code from WIP OmniBlade -> TheSuperHackers
+`git clone https://github.com/TheSuperHackers/GeneralsGameCode.git`
 
-`git clone https://github.com/OmniBlade/CnC_Generals_Zero_Hour.git`
-
-`cd CnC_Generals_Zero_Hour`
-
-`git switch blade/cmake-build`
+`cd GeneralsGameCode`
 
 ## Compilation
 
 This steps you need to repeat every time after a reboot of your computer.
 
 ### Option 1: Activate your VS6 Compiler Environment
 
-Execute the setup build environment script. In your cmd type this.
+Execute the setup build environment script. In your cmd type this. (assuming default installation path)
 
 `"C:\Program Files (x86)\Microsoft Visual Studio\VC98\Bin\VCVARS32.bat"`
 
@@ -106,21 +102,21 @@ set CXX=C:\<VS6_INSTALL_PATH>\VC98\Bin\CL.exe
 set MSVCDir=C:\<VS6_INSTALL_PATH>\VC98
 ```
 
-### Compiling
-
-`cmake --preset vc6`
-
-`cd build\vc6`
+### Build the project
 
-`nmake`
+Run the following command by the type of build you want to create.
 
-You will find a bunch of files in `build\vc6` and a file called `zerohour.exe`
+- `cmake --workflow --preset vc6` for a release build.
+- `cmake --workflow --preset vc6dgb` for a debug build.
+- `cmake --workflow --preset vc6int` for an internal build.
+- `cmake --workflow --preset vc6prof` for a profile build.
 
-Copy `zerohour.exe` of the build folder to your game path.
+You will find a bunch of files in `build\vc6\<game name>` and a file called `generalszh.exe` or `generalsv.exe`.
 
-## Start the game
+### Install the game executable
 
-Double click `zerohour.exe` inside the Zero Hour path.
+Run `cmake --install build\<vc6 build type>`, this will copy the executable to the retail game directory, or you can
+copy it manually.
 
 ## Troubleshooting