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

build: add libuv library path and timer module to MSVC project files

Browse Source 
Add libuv release library directory to LibraryPath for both Debug and Win32 configurations in wren.vcxproj. Include timer.c and timer.h source files in the project filters. Extend AdditionalIncludeDirectories with cli, module, and libuv include paths. Implement rmtree_onerror handler for permission-safe directory cleanup in libuv.py, and enable Windows libuv build via vcbuild.bat.
This commit is contained in:
Rohan Singh
2015-08-13 05:39:34 +00:00
parent 85487d9d8c
commit 7269ded75c
3 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/msvc2013/wren/wren.vcxproj
+8 -6
View File
@@ -42,13 +42,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\..\src\include</IncludePath>
<LibraryPath>$(SolutionDir)..\..\build\vs\$(Configuration)\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
<LibraryPath>$(SolutionDir)..\..\build\vs\$(Configuration)\;$(SolutionDir)..\..\build\libuv\Release\lib\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
<OutDir>$(SolutionDir)..\..\build\vs\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)..\..\src\include;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)..\..\build\vs\$(Configuration)\;$(LibraryPath)</LibraryPath>
<LibraryPath>$(SolutionDir)..\..\build\vs\$(Configuration)\;$(SolutionDir)..\..\build\libuv\Release\lib\;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)..\..\build\vs\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -58,12 +58,12 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\cli;..\..\..\src\module;..\..\..\include;..\..\..\build\libuv\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>wren_static_d.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>wren_static_d.lib;libuv.lib;ws2_32.lib;psapi.lib;iphlpapi.lib;userenv.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -75,25 +75,27 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\src;..\..\..\src\cli;..\..\..\src\module;..\..\..\include;..\..\..\build\libuv\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>wren_static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>wren_static.lib;libuv.lib;ws2_32.lib;psapi.lib;iphlpapi.lib;userenv.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\cli\io.c" />
<ClCompile Include="..\..\..\src\cli\main.c" />
<ClCompile Include="..\..\..\src\cli\vm.c" />
<ClCompile Include="..\..\..\src\module\timer.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\cli\io.h" />
<ClInclude Include="..\..\..\src\cli\vm.h" />
<ClInclude Include="..\..\..\src\include\wren.h" />
<ClInclude Include="..\..\..\src\module\timer.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\wren_lib\wren_lib.vcxproj">
project/msvc2013/wren/wren.vcxproj.filters
+6
View File
@@ -24,6 +24,9 @@
<ClCompile Include="..\..\..\src\cli\vm.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\module\timer.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\include\wren.h">
@@ -35,5 +38,8 @@
<ClInclude Include="..\..\..\src\cli\vm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\module\timer.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>