Skip to content
This repository was archived by the owner on Feb 12, 2023. It is now read-only.

add project files for VS2017, and update build.js to choose #12

Open
trivalik wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add project files for VS2017, and update build.js to choose #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82d27cf
add project files for VS2017, and update build.js to choose
Jan 24, 2018
1d3b9fe
set output path to reduce warnings
Feb 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions lib/ta-lib/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,33 @@
var exec = require('child_process').exec;
var msbuildPath = '"C:/Program Files (x86)/MSBuild/14.0/Bin/';

console.log('building talib functions...');
var flags = "";

if(process.platform == 'win32') {
process.chdir('./lib/ta-lib/make/csr/windows/msbuild/');
function startMsbuild(version, argMsbuildPath) {
process.chdir('./lib/ta-lib/make/csr/windows/msbuild' + version + '/');

exec(msbuildPath + 'MSBuild" ./ta_lib.sln /property:Configuration=csr /property:Platform=x64', function(err, stdout, stderr) {
console.log(stdout, stderr);
});
exec('"' + argMsbuildPath + '\\MSBuild\\' + version + '.0\\Bin\\MSBuild" .\\ta_lib.sln /property:Configuration=csr /property:Platform=x64', function(err, stdout, stderr) {
console.log(stdout, stderr);
});
}

var fs = require('fs');
var msbuildPath = process.env['ProgramFiles(x86)'];

if (!fs.existsSync(msbuildPath + '\\MSBuild\\14.0\\Bin')) {
var vswhere = exec('"' + __dirname + '\\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath', function(err, stdout, stderr) {
if (err instanceof Error)
throw err;
});

vswhere.stdout.on('data', function(data) {
startMsbuild(15, data.trim());
});
}
else {
startMsbuild(14, msbuildPath);
}
} else {
var flags = "";

Expand Down
0 ...ws/msbuild/ta_abstract/ta_abstract.vcproj → .../msbuild14/ta_abstract/ta_abstract.vcproj
View file
Open in desktop
File renamed without changes.
26 changes: 16 additions & 10 deletions ...s/msbuild/ta_abstract/ta_abstract.vcxproj → ...msbuild14/ta_abstract/ta_abstract.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,28 +158,34 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='cdr|Win32'">
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='cmd|Win32'">
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='cdd|Win32'">
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='cmr|Win32'">
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='csr|Win32'">
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
<TargetExt>.a</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='csr|x64'">
<TargetExt>.lib</TargetExt>
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='cdr|Win32'">
<ClCompile>
Expand All @@ -205,7 +211,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -240,7 +246,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -276,7 +282,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -311,7 +317,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -347,7 +353,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -382,7 +388,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -417,7 +423,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -452,7 +458,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -487,7 +493,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -522,7 +528,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down
0 ...d/ta_abstract/ta_abstract.vcxproj.filters → ...4/ta_abstract/ta_abstract.vcxproj.filters
View file
Open in desktop
File renamed without changes.
0 ...indows/msbuild/ta_common/ta_common.vcproj → ...dows/msbuild14/ta_common/ta_common.vcproj
View file
Open in desktop
File renamed without changes.
26 changes: 16 additions & 10 deletions ...ndows/msbuild/ta_common/ta_common.vcxproj → ...ows/msbuild14/ta_common/ta_common.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,28 +157,34 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='cmr|Win32'">
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='csr|Win32'">
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
<TargetExt>.a</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='csr|x64'">
<TargetExt>.lib</TargetExt>
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='cmd|Win32'">
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='cdr|Win32'">
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='cdd|Win32'">
<OutDir>.\..\..\..\..\..\lib\</OutDir>
<IntDir>.\..\..\..\..\..\temp\$(Configuration)\$(ProjectName)\</IntDir>
<TargetName>$(ProjectName)_$(Configuration)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='cmr|Win32'">
<ClCompile>
Expand All @@ -204,7 +210,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -239,7 +245,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -274,7 +280,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -309,7 +315,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -345,7 +351,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -380,7 +386,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -415,7 +421,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -450,7 +456,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -484,7 +490,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down Expand Up @@ -518,7 +524,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Lib>
<OutputFile>.\..\..\..\..\..\lib/$(ProjectName)_$(Configuration).lib</OutputFile>
<OutputFile>.\..\..\..\..\..\lib\$(ProjectName)_$(Configuration).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
<Xdcmake>
Expand Down
0 ...build/ta_common/ta_common.vcxproj.filters → ...ild14/ta_common/ta_common.vcxproj.filters
View file
Open in desktop
File renamed without changes.
0 ...sr/windows/msbuild/ta_func/ta_func.vcproj → .../windows/msbuild14/ta_func/ta_func.vcproj
View file
Open in desktop
File renamed without changes.
Loading