From 0e50974f803f62910c5f92765d534aa5f73e7f8e Mon Sep 17 00:00:00 2001 From: Peter Harris Date: Mon, 30 Mar 2020 14:28:35 -0400 Subject: backend/vs: Fix link of wmain / wWinMain based apps Executables may have an entry point of wmain or wWinMain. These executables link successfully with ninja. Rather than add more flags to executable() in meson.build, remove the EntryPointSymbol override. This makes the vs backend behave more like the ninja backend. Fixes #6698 --- mesonbuild/backend/vs2010backend.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'mesonbuild') diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 8ae90b7..94ac1c6 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -744,19 +744,16 @@ class Vs2010Backend(backends.Backend): def gen_vcxproj(self, target, ofname, guid): mlog.debug('Generating vcxproj %s.' % target.name) - entrypoint = 'WinMainCRTStartup' subsystem = 'Windows' self.handled_target_deps[target.get_id()] = [] if isinstance(target, build.Executable): conftype = 'Application' if not target.gui_app: subsystem = 'Console' - entrypoint = 'mainCRTStartup' elif isinstance(target, build.StaticLibrary): conftype = 'StaticLibrary' elif isinstance(target, build.SharedLibrary): conftype = 'DynamicLibrary' - entrypoint = '_DllMainCrtStartup' elif isinstance(target, build.CustomTarget): return self.gen_custom_target_vcxproj(target, ofname, guid) elif isinstance(target, build.RunTarget): @@ -1180,8 +1177,6 @@ class Vs2010Backend(backends.Backend): if '/ZI' in buildtype_args or '/Zi' in buildtype_args: pdb = ET.SubElement(link, 'ProgramDataBaseFileName') pdb.text = '$(OutDir}%s.pdb' % target_name - if isinstance(target, build.Executable): - ET.SubElement(link, 'EntryPointSymbol').text = entrypoint targetmachine = ET.SubElement(link, 'TargetMachine') targetplatform = self.platform.lower() if targetplatform == 'win32': -- cgit v1.1