retoor/wren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.0; fix misconfigured nan tagging build, and update travis

Browse Source
This commit is contained in:
underscorediscovery
2020-05-28 09:57:29 -07:00
parent 2fc4be6e38
commit dd510c2995
14 changed files with 247 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/vs2019/wren-cli.sln
+6 -6
View File
@@ -5,28 +5,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wren_cli", "wren_cli.vcxpro
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
64bit-no-nan-tagging|64bit = 64bit-no-nan-tagging|64bit
Debug|64bit = Debug|64bit
Release|64bit = Release|64bit
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
64bit-no-nan-tagging|32bit = 64bit-no-nan-tagging|32bit
Debug|32bit = Debug|32bit
Debug|64bit-no-nan-tagging = Debug|64bit-no-nan-tagging
Release|32bit = Release|32bit
Release|64bit-no-nan-tagging = Release|64bit-no-nan-tagging
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.64bit-no-nan-tagging|32bit.ActiveCfg = 64bit-no-nan-tagging 32bit|Win32
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.64bit-no-nan-tagging|32bit.Build.0 = 64bit-no-nan-tagging 32bit|Win32
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.64bit-no-nan-tagging|64bit.ActiveCfg = 64bit-no-nan-tagging 64bit|x64
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.64bit-no-nan-tagging|64bit.Build.0 = 64bit-no-nan-tagging 64bit|x64
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Debug|32bit.ActiveCfg = Debug 32bit|Win32
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Debug|32bit.Build.0 = Debug 32bit|Win32
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Debug|64bit.ActiveCfg = Debug 64bit|x64
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Debug|64bit.Build.0 = Debug 64bit|x64
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Debug|64bit-no-nan-tagging.ActiveCfg = Debug 64bit-no-nan-tagging|Win32
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Debug|64bit-no-nan-tagging.Build.0 = Debug 64bit-no-nan-tagging|Win32
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Release|32bit.ActiveCfg = Release 32bit|Win32
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Release|32bit.Build.0 = Release 32bit|Win32
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Release|64bit.ActiveCfg = Release 64bit|x64
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Release|64bit.Build.0 = Release 64bit|x64
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Release|64bit-no-nan-tagging.ActiveCfg = Release 64bit-no-nan-tagging|Win32
{F8A65189-E473-AC94-0D8D-9A3CF9B8E122}.Release|64bit-no-nan-tagging.Build.0 = Release 64bit-no-nan-tagging|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
projects/vs2019/wren_cli.vcxproj
+61 -54
View File
@@ -17,6 +17,14 @@
<Configuration>Release 32bit</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release 64bit-no-nan-tagging|x64">
<Configuration>Release 64bit-no-nan-tagging</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release 64bit-no-nan-tagging|Win32">
<Configuration>Release 64bit-no-nan-tagging</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug 64bit|x64">
<Configuration>Debug 64bit</Configuration>
<Platform>x64</Platform>
@@ -33,20 +41,12 @@
<Configuration>Debug 32bit</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="64bit-no-nan-tagging 64bit|x64">
<Configuration>64bit-no-nan-tagging 64bit</Configuration>
<ProjectConfiguration Include="Debug 64bit-no-nan-tagging|x64">
<Configuration>Debug 64bit-no-nan-tagging</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="64bit-no-nan-tagging 64bit|Win32">
<Configuration>64bit-no-nan-tagging 64bit</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="64bit-no-nan-tagging 32bit|x64">
<Configuration>64bit-no-nan-tagging 32bit</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="64bit-no-nan-tagging 32bit|Win32">
<Configuration>64bit-no-nan-tagging 32bit</Configuration>
<ProjectConfiguration Include="Debug 64bit-no-nan-tagging|Win32">
<Configuration>Debug 64bit-no-nan-tagging</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
@@ -70,6 +70,12 @@
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 64bit-no-nan-tagging|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 64bit|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@@ -82,15 +88,9 @@
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='64bit-no-nan-tagging 64bit|x64'" Label="Configuration">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 64bit-no-nan-tagging|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='64bit-no-nan-tagging 32bit|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
@@ -103,16 +103,16 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release 32bit|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release 64bit-no-nan-tagging|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug 64bit|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug 32bit|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='64bit-no-nan-tagging 64bit|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='64bit-no-nan-tagging 32bit|Win32'">
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug 64bit-no-nan-tagging|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
@@ -130,6 +130,13 @@
<TargetName>wren_cli</TargetName>
<TargetExt>.exe</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 64bit-no-nan-tagging|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\bin\</OutDir>
<IntDir>obj\64bit-no-nan-tagging\Release\</IntDir>
<TargetName>wren_cli</TargetName>
<TargetExt>.exe</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 64bit|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>..\..\bin\</OutDir>
@@ -144,18 +151,11 @@
<TargetName>wren_cli_d</TargetName>
<TargetExt>.exe</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='64bit-no-nan-tagging 64bit|x64'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 64bit-no-nan-tagging|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>..\..\bin\</OutDir>
<IntDir>obj\64bit\64bit-no-nan-tagging\</IntDir>
<TargetName>wren_cli</TargetName>
<TargetExt>.exe</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='64bit-no-nan-tagging 32bit|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>..\..\bin\</OutDir>
<IntDir>obj\32bit\64bit-no-nan-tagging\</IntDir>
<TargetName>wren_cli</TargetName>
<IntDir>obj\64bit-no-nan-tagging\Debug\</IntDir>
<TargetName>wren_cli_d</TargetName>
<TargetExt>.exe</TargetExt>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 64bit|x64'">
@@ -202,6 +202,28 @@
<AdditionalOptions>/OPT:NOREF %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 64bit-no-nan-tagging|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>NDEBUG;WREN_NAN_TAGGING=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\src\cli;..\..\src\module;..\..\deps\wren\include;..\..\deps\wren\src\vm;..\..\deps\wren\src\optional;..\..\deps\libuv\include;..\..\deps\libuv\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<MinimalRebuild>false</MinimalRebuild>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>imm32.lib;winmm.lib;version.lib;wldap32.lib;ws2_32.lib;psapi.lib;iphlpapi.lib;userenv.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/OPT:NOREF %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 64bit|x64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -240,36 +262,21 @@
<AdditionalOptions>/OPT:NOREF %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='64bit-no-nan-tagging 64bit|x64'">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 64bit-no-nan-tagging|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>DEBUG;WREN_NAN_TAGGING=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\src\cli;..\..\src\module;..\..\deps\wren\include;..\..\deps\wren\src\vm;..\..\deps\wren\src\optional;..\..\deps\libuv\include;..\..\deps\libuv\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>imm32.lib;winmm.lib;version.lib;wldap32.lib;ws2_32.lib;psapi.lib;iphlpapi.lib;userenv.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/OPT:NOREF %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='64bit-no-nan-tagging 32bit|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\src\cli;..\..\src\module;..\..\deps\wren\include;..\..\deps\wren\src\vm;..\..\deps\wren\src\optional;..\..\deps\libuv\include;..\..\deps\libuv\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>Disabled</Optimization>
<MinimalRebuild>false</MinimalRebuild>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>imm32.lib;winmm.lib;version.lib;wldap32.lib;ws2_32.lib;psapi.lib;iphlpapi.lib;userenv.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/OPT:NOREF %(AdditionalOptions)</AdditionalOptions>
</Link>