Compare commits

...

2 Commits

2 changed files with 4 additions and 1 deletions

View File

@@ -547,6 +547,7 @@ vars.Add('LINKFLAGS', 'Linker Flags')
vars.Add('PYTHON', 'Python Executable', 'python')
vars.Add('COMPILATIONDB_FILTER_FILES', 'Removes source files from the compilation DB that are not from the current'
' project.', config['COMPILATIONDB_FILTER_FILES'])
vars.Add('SHOW_INCLUDES', 'Show include hierarchy (for debugging).', False)
tools = ['default', 'compilation_db', 'unity_build']
if 'TOOLS' in config:
@@ -716,6 +717,8 @@ elif env['COMPILER_FAMILY'] == 'cl':
f'/std:{cxx_version_name}', '/permissive-', '/EHsc', '/FS', '/Zc:char8_t', '/utf-8'])
env.Append(CPPDEFINES = ['_CRT_SECURE_NO_WARNINGS']) # I'd like to not use MSVC specific versions of functions because they are "safer" ...
env.Append(DEPS_CXXFLAGS = ['/EHsc', '/Zc:char8_t', '/utf-8', '/vmg'])
if env['SHOW_INCLUDES']:
env.Append(CCFLAGS = ['/showIncludes'])
if build_type == 'debug':
env.Append(CCFLAGS = ['/Od', '/Zi', '/MDd'], LINKFLAGS = ' /DEBUG')
env.Append(CPPDEFINES = ['_DEBUG', '_ITERATOR_DEBUG_LEVEL=2'])

View File

@@ -11,7 +11,7 @@ def _git_cook(env: Environment, repo: dict) -> dict:
libs = []
if platform.system() == 'Windows':
if env['BUILD_TYPE'] == 'debug':
lib_names = ['SDL2-staticd', 'SDL3-staticd']
lib_names = ['SDL2-staticd', 'SDL3-static']
else:
lib_names = ['SDL2-static', 'SDL3-static']
libs.extend(('kernel32', 'user32', 'gdi32', 'winmm', 'imm32', 'ole32', 'oleaut32', 'version', 'uuid', 'advapi32', 'setupapi', 'shell32', 'dinput8'))