diff options
author | Peter Harris <pharris@opentext.com> | 2020-03-30 14:28:35 -0400 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-04 21:46:09 +0300 |
commit | 0e50974f803f62910c5f92765d534aa5f73e7f8e (patch) | |
tree | ba79edee88ff549095b422e5bbdd908e41fead92 /mesonbuild/backend/vs2010backend.py | |
parent | 96ed64caa11f977c33ae8bf4143f8756ab3c1a36 (diff) | |
download | meson-0e50974f803f62910c5f92765d534aa5f73e7f8e.zip meson-0e50974f803f62910c5f92765d534aa5f73e7f8e.tar.gz meson-0e50974f803f62910c5f92765d534aa5f73e7f8e.tar.bz2 |
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
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
-rw-r--r-- | mesonbuild/backend/vs2010backend.py | 5 |
1 files changed, 0 insertions, 5 deletions
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': |