Skip to content

[CMAKE][ZH] Remove obsolete profile library and builds #1084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 0 additions & 84 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@
}
}
},
{
"name": "vc6-profile",
"displayName": "Windows 32bit VC6 Profile",
"hidden": false,
"inherits": "vc6",
"cacheVariables": {
"RTS_BUILD_OPTION_PROFILE": "ON"
}
},
{
"name": "vc6-internal",
"displayName": "Windows 32bit VC6 Internal",
Expand Down Expand Up @@ -95,14 +86,6 @@
}
}
},
{
"name": "win32-profile",
"inherits": "win32",
"displayName": "Windows 32bit Profile",
"cacheVariables": {
"RTS_BUILD_OPTION_PROFILE": "ON"
}
},
{
"name": "win32-internal",
"inherits": "win32",
Expand Down Expand Up @@ -137,14 +120,6 @@
}
}
},
{
"name": "win32-vcpkg-profile",
"inherits": "win32-vcpkg",
"displayName": "Windows 32bit VCPKG Profile",
"cacheVariables": {
"RTS_BUILD_OPTION_PROFILE": "ON"
}
},
{
"name": "win32-vcpkg-internal",
"inherits": "win32-vcpkg",
Expand Down Expand Up @@ -181,12 +156,6 @@
"displayName": "Build Windows 32bit VC6 Internal",
"description": "Build Windows 32bit VC6 Internal"
},
{
"name": "vc6-profile",
"configurePreset": "vc6-profile",
"displayName": "Build Windows 32bit VC6 Profile",
"description": "Build Windows 32bit VC6 Profile"
},
{
"name": "vc6-debug",
"configurePreset": "vc6-debug",
Expand All @@ -207,13 +176,6 @@
"description": "Build Windows 32bit Internal",
"configuration": "Release"
},
{
"name": "win32-profile",
"configurePreset": "win32-profile",
"displayName": "Build Windows 32bit Profile",
"description": "Build Windows 32bit Profile",
"configuration": "Release"
},
{
"name": "win32-debug",
"configurePreset": "win32-debug",
Expand All @@ -235,13 +197,6 @@
"description": "Build Windows 32bit VCPKG Internal",
"configuration": "Release"
},
{
"name": "win32-vcpkg-profile",
"configurePreset": "win32-vcpkg-profile",
"displayName": "Build Windows 32bit VCPKG Profile",
"description": "Build Windows 32bit VCPKG Profile",
"configuration": "Release"
},
{
"name": "win32-vcpkg-debug",
"configurePreset": "win32-vcpkg-debug",
Expand Down Expand Up @@ -297,19 +252,6 @@
}
]
},
{
"name": "vc6-profile",
"steps": [
{
"type": "configure",
"name": "vc6-profile"
},
{
"type": "build",
"name": "vc6-profile"
}
]
},
{
"name": "win32",
"steps": [
Expand All @@ -336,19 +278,6 @@
}
]
},
{
"name": "win32-profile",
"steps": [
{
"type": "configure",
"name": "win32-profile"
},
{
"type": "build",
"name": "win32-profile"
}
]
},
{
"name": "win32-debug",
"steps": [
Expand Down Expand Up @@ -388,19 +317,6 @@
}
]
},
{
"name": "win32-vcpkg-profile",
"steps": [
{
"type": "configure",
"name": "win32-vcpkg-profile"
},
{
"type": "build",
"name": "win32-vcpkg-profile"
}
]
},
{
"name": "win32-vcpkg-debug",
"steps": [
Expand Down
3 changes: 0 additions & 3 deletions Core/Libraries/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# WW common libraries decended from earliest C&C games
add_subdirectory(Source/WWVegas)

# profiling library
add_subdirectory(Source/profile)

# debugging library
add_subdirectory(Source/debug)

Expand Down
37 changes: 0 additions & 37 deletions Core/Libraries/Include/rts/profile.h

This file was deleted.

15 changes: 1 addition & 14 deletions Core/Libraries/Source/debug/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
Generally speaking there are four different library variants:
- Internal: all asserts/checks/logs, full optimizations (RTS_INTERNAL macro defined)
- %Debug: all asserts/checks/logs, no optimizations (RTS_DEBUG macro defined)
- Profile: all asserts/checks/logs, full optimizations, profiling active (RTS_PROFILE macro defined)
- Release: no asserts/checks/logs, full optimizations

These variants will be broken down into separate features which
Expand All @@ -49,7 +48,6 @@
<td><b>HAS_ASSERTS</b></td>
<td><b>HAS_LOGS</b></td>
<td><b>HAS_OPT</b></td>
<td><b>HAS_PROFILE</b></td>
</tr><tr>
<td>Internal</td>
<td><center>Y</center></td>
Expand All @@ -62,12 +60,6 @@
<td><center>Y</center></td>
<td><center></center></td>
<td><center></center></td>
</tr><tr>
<td>Profile</td>
<td><center>Y</center></td>
<td><center>Y</center></td>
<td><center>Y</center></td>
<td><center>Y</center></td>
</tr><tr>
<td>Release</td>
<td><center></center></td>
Expand All @@ -80,7 +72,6 @@
library variant:
- Internal: XXXInternal.lib
- %Debug: XXXDebug.lib
- Profile: XXXProfile.lib
- Release: XXX.lib
*/

Expand All @@ -89,7 +80,7 @@
#endif

// Define which libraries to use.
#if defined(RTS_INTERNAL) || defined(RTS_DEBUG) || defined(RTS_PROFILE)
#if defined(RTS_INTERNAL) || defined(RTS_DEBUG)
# define HAS_ASSERTS
# define HAS_LOGS
#endif
Expand All @@ -98,10 +89,6 @@
# define HAS_OPT
#endif

#if defined(RTS_PROFILE)
# define HAS_PROFILE
#endif

// include all our public header files (use double quotes here)
#include "debug_doc.h"
#include "debug_macro.h"
Expand Down
2 changes: 0 additions & 2 deletions Core/Libraries/Source/debug/debug_debug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@

void Debug::InstallExceptionHandler(void)
{
_set_se_translator(LocalSETranslator);

Check warning on line 260 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / Preset win32-debug+t+e

calling _set_se_translator() requires /EHa

Check warning on line 260 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / Preset win32+t+e

calling _set_se_translator() requires /EHa

Check warning on line 260 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / Preset win32-internal+t+e

calling _set_se_translator() requires /EHa

Check warning on line 260 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / Preset win32-vcpkg-debug+t+e

calling _set_se_translator() requires /EHa

Check warning on line 260 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / Preset win32-vcpkg+t+e

calling _set_se_translator() requires /EHa

Check warning on line 260 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / Preset win32-vcpkg-internal+t+e

calling _set_se_translator() requires /EHa
}

bool Debug::SkipNext(void)
Expand Down Expand Up @@ -713,9 +713,9 @@
unsigned len=strlen(str);

// forced width?
if (len<m_width)

Check warning on line 716 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / Preset win32-debug+t+e

'<': signed/unsigned mismatch

Check warning on line 716 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / Preset win32+t+e

'<': signed/unsigned mismatch

Check warning on line 716 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / Preset win32-internal+t+e

'<': signed/unsigned mismatch

Check warning on line 716 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / Preset win32-vcpkg-debug+t+e

'<': signed/unsigned mismatch

Check warning on line 716 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / Preset win32-vcpkg+t+e

'<': signed/unsigned mismatch

Check warning on line 716 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / Preset win32-vcpkg-internal+t+e

'<': signed/unsigned mismatch
{
for (unsigned k=len;k<m_width;k++)

Check warning on line 718 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / Preset win32-debug+t+e

'<': signed/unsigned mismatch

Check warning on line 718 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / Preset win32+t+e

'<': signed/unsigned mismatch

Check warning on line 718 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / Preset win32-internal+t+e

'<': signed/unsigned mismatch

Check warning on line 718 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / Preset win32-vcpkg-debug+t+e

'<': signed/unsigned mismatch

Check warning on line 718 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / Preset win32-vcpkg+t+e

'<': signed/unsigned mismatch

Check warning on line 718 in Core/Libraries/Source/debug/debug_debug.cpp

View workflow job for this annotation

GitHub Actions / Build Generals / Preset win32-vcpkg-internal+t+e

'<': signed/unsigned mismatch
AddOutput(&m_fillChar,1);
}

Expand Down Expand Up @@ -1441,8 +1441,6 @@
operator<<(" internal");
#elif defined(RTS_DEBUG)
operator<<(" debug");
#elif defined(RTS_PROFILE)
operator<<(" profile");
#else
operator<<(" release");
#endif
Expand Down
32 changes: 0 additions & 32 deletions Core/Libraries/Source/profile/CMakeLists.txt

This file was deleted.

29 changes: 0 additions & 29 deletions Core/Libraries/Source/profile/_pch.cpp

This file was deleted.

42 changes: 0 additions & 42 deletions Core/Libraries/Source/profile/_pch.h

This file was deleted.

26 changes: 0 additions & 26 deletions Core/Libraries/Source/profile/compile_doxygen.bat

This file was deleted.

Loading
Loading