diff options
| author |  Masood Malekghassemi <soltanmm@users.noreply.github.com> | 2016-02-22 11:37:22 -0800 |
|---|---|---|
| committer | Masood Malekghassemi <soltanmm@users.noreply.github.com> | 2016-02-22 11:37:22 -0800 |
| commit | 9f791595903b926e32b3d2ec5d959cfe1a3e1e78 (patch) | |
| tree | 0219433bc4027525af27e6ac724d7f290822c6be /templates | |
| parent | 5bcddc89a9124e8f48dab1c8a6828236f2968c70 (diff) | |
| parent | 6a4e473d4ab40f60f719876fa0f72f4dcb2a5d37 (diff) | |
Merge pull request #5302 from nicolasnoble/python-windows
Enabling python artifact building for Windows.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vsprojects/vcxproj.filters_defs.include | 5 | ||||
| -rw-r--r-- | templates/vsprojects/vcxproj_defs.include | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/templates/vsprojects/vcxproj.filters_defs.include b/templates/vsprojects/vcxproj.filters_defs.include index 7e2fbac147..e7df8db763 100644 --- a/templates/vsprojects/vcxproj.filters_defs.include +++ b/templates/vsprojects/vcxproj.filters_defs.include @@ -23,6 +23,11 @@ % endfor </ItemGroup> % endif + % if project.get('dll_def', None): + <ItemGroup> + <None Include="${get_repo_root(project)}\${to_windows_path(project.dll_def)}" /> + </ItemGroup> + % endif % if project.get('public_headers',[]): <ItemGroup> % for public_header in project.public_headers: diff --git a/templates/vsprojects/vcxproj_defs.include b/templates/vsprojects/vcxproj_defs.include index b57c27f76a..e598f1319b 100644 --- a/templates/vsprojects/vcxproj_defs.include +++ b/templates/vsprojects/vcxproj_defs.include @@ -2,6 +2,9 @@ <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\ <%def name="get_subsystem(is_library)">${'Windows' if is_library else 'Console'}</%def>\ <%def name="item_definition_group(project, target, debug, dll, _64bit)">\ +<% + repo_root = '$(SolutionDir)\..' +%>\ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='${'%s%s|%s' % ('Debug' if debug else 'Release', '-DLL' if dll else '', 'x64' if _64bit else 'Win32')}'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> @@ -23,6 +26,12 @@ <SubSystem>${get_subsystem(project.is_library)}</SubSystem> <GenerateDebugInformation Condition="!$(Jenkins)">true</GenerateDebugInformation> <GenerateDebugInformation Condition="$(Jenkins)">false</GenerateDebugInformation> +% if project.get("noentry", False): + <NoEntryPoint>true</NoEntryPoint> +% endif +% if project.get("dll_def", None): + <ModuleDefinitionFile>${repo_root}\${to_windows_path(project.dll_def)}</ModuleDefinitionFile> +% endif % if not debug: <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> @@ -194,6 +203,11 @@ ${gen_package_props(packages, repo_root)}\ % endfor </ItemGroup> % endif + % if project.get('dll_def', None): + <ItemGroup> + <None Include="${repo_root}\${to_windows_path(project.dll_def)}" /> + </ItemGroup> + % endif % if project.get('src',[]): <ItemGroup> % for src_name in project.src: |