gyp improvements:
* Add a src/configurations.gypi file that can be included on the gyp command-line to enable 32-bit and 64-bit builds in the generated project files. * Make winpty.gyp work if gyp is run with Cygwin python. It still works with normal python.
This commit is contained in:
parent
f5e8b4cd28
commit
2ae966521e
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -13,4 +13,5 @@ configure text
|
||||
|
||||
*.sh eol=lf
|
||||
configure eol=lf
|
||||
VERSION.txt eol=lf
|
||||
shared/GetCommitHash.cmd text eol=crlf
|
||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -2,9 +2,10 @@
|
||||
*.suo
|
||||
*.vcxproj
|
||||
*.vcxproj.filters
|
||||
Default
|
||||
winpty.sdf
|
||||
winpty.opensdf
|
||||
/config.mk
|
||||
/build
|
||||
/ship/packages
|
||||
/src/Default
|
||||
/src/Release
|
||||
|
39
src/configurations.gypi
Executable file
39
src/configurations.gypi
Executable file
@ -0,0 +1,39 @@
|
||||
# By default gyp/msbuild build for 32-bit Windows. To build 64-bit Windows,
|
||||
# use this file.
|
||||
#
|
||||
# C:\proj\winpty\src>gyp -I configurations.gypi
|
||||
#
|
||||
# This command generates Visual Studio project files with a Release
|
||||
# configuration and two Platforms--Win32 and x64. Both can be built:
|
||||
#
|
||||
# C:\proj\winpty\src>msbuild winpty.sln /p:Platform=Win32
|
||||
# C:\proj\winpty\src>msbuild winpty.sln /p:Platform=x64
|
||||
#
|
||||
# The output is placed in:
|
||||
#
|
||||
# C:\proj\winpty\src\Release\Win32
|
||||
# C:\proj\winpty\src\Release\x64
|
||||
#
|
||||
# This file is not included by default, because I suspect it would interfere
|
||||
# with node-gyp, which has a different system for building 32-vs-64-bit
|
||||
# binaries. It uses a common.gypi, and the project files it generates can only
|
||||
# build a single architecture, the output paths are not differentiated by
|
||||
# architecture.
|
||||
|
||||
{
|
||||
'target_defaults': {
|
||||
'default_configuration': 'Release_Win32',
|
||||
'configurations': {
|
||||
'Release_Win32': {
|
||||
'msvs_configuration_platform': 'Win32',
|
||||
},
|
||||
'Release_x64': {
|
||||
'msvs_configuration_platform': 'x64',
|
||||
},
|
||||
},
|
||||
'msvs_configuration_attributes': {
|
||||
'OutputDirectory': '$(SolutionDir)$(ConfigurationName)\\$(Platform)',
|
||||
'IntermediateDirectory': '$(ConfigurationName)\\$(Platform)\\obj\\$(ProjectName)',
|
||||
}
|
||||
}
|
||||
}
|
@ -12,9 +12,9 @@
|
||||
'_UNICODE',
|
||||
'_WIN32_WINNT=0x0501',
|
||||
'NOMINMAX',
|
||||
'WINPTY_VERSION=<!(type ..\VERSION.txt)',
|
||||
'WINPTY_VERSION=<!(cmd /c "cd .. && type VERSION.txt")',
|
||||
'WINPTY_VERSION_SUFFIX=<(VERSION_SUFFIX)',
|
||||
'WINPTY_COMMIT_HASH=<!(shared\GetCommitHash.cmd)',
|
||||
'WINPTY_COMMIT_HASH=<!(cmd /c "cd shared && GetCommitHash.cmd")',
|
||||
],
|
||||
},
|
||||
'targets' : [
|
||||
|
Loading…
Reference in New Issue
Block a user