Skip to content

Commit

Permalink
Added Wrapper DLL to SDK
Browse files Browse the repository at this point in the history
Fixed minor compilation bug
  • Loading branch information
shauleiz committed Jan 15, 2017
1 parent d5515b2 commit 73e18ea
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 20 deletions.
4 changes: 2 additions & 2 deletions BuildAll.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set BUILD_STATUS=%ERRORLEVEL%
if not %BUILD_STATUS%==0 goto fail

echo %DATE% %TIME%: Building vGen (x86)
"%BUILDER%" vGen.sln /maxcpucount:4 /p:Platform=x86;Configuration=Release
"%BUILDER%" vGen.sln /maxcpucount:4 /t:rebuild /p:Platform=x86;Configuration=Release
set BUILD_STATUS=%ERRORLEVEL%
if not %BUILD_STATUS%==0 goto fail

Expand All @@ -25,7 +25,7 @@ set BUILD_STATUS=%ERRORLEVEL%
if not %BUILD_STATUS%==0 goto fail

echo %DATE% %TIME%: Building vGen (x64)
"%BUILDER%" vGen.sln /maxcpucount:4 /p:Platform=x64;Configuration=Release
"%BUILDER%" vGen.sln /maxcpucount:4 /t:rebuild /p:Platform=x64;Configuration=Release
set BUILD_STATUS=%ERRORLEVEL%
if not %BUILD_STATUS%==0 goto fail

Expand Down
16 changes: 9 additions & 7 deletions CreateSdk.bat
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
rem Create SDK for vGen API


XCOPY x64\Release\vGenInterface.dll .\SDK\x64\
XCOPY x64\Release\vGenInterface.lib .\SDK\x64\
XCOPY x64\Release\vGenInterface.pdb .\SDK\x64\
XCOPY /y x64\Release\vGenInterface.dll .\SDK\x64\
XCOPY /y x64\Release\vGenInterface.lib .\SDK\x64\
XCOPY /y x64\Release\vGenInterface.pdb .\SDK\x64\
XCOPY /y x64\Release\vGenInterfaceWrap.dll .\SDK\x64\

XCOPY Win32\Release\vGenInterface.dll .\SDK\x86\
XCOPY Win32\Release\vGenInterface.lib .\SDK\x86\
XCOPY Win32\Release\vGenInterface.pdb .\SDK\x86\
XCOPY /y Win32\Release\vGenInterface.dll .\SDK\x86\
XCOPY /y Win32\Release\vGenInterface.lib .\SDK\x86\
XCOPY /y Win32\Release\vGenInterface.pdb .\SDK\x86\
XCOPY /y Win32\Release\vGenInterfaceWrap.dll .\SDK\x86\

XCOPY .\vGenInterface.h .\SDK\Include\
XCOPY /y .\vGenInterface.h .\SDK\Include\
Binary file modified Win32/Release/vGenInterface.dll
Binary file not shown.
15 changes: 6 additions & 9 deletions vGenWrap/ComTest/ComTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="vGenInterfaceWrap, Version=1.0.0.6, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\x64\Debug\vGenInterfaceWrap.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
Expand All @@ -80,6 +71,12 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\vGenInterfaceWrap.csproj">
<Project>{ff5aae17-ba16-46b5-8c7b-ac860878d008}</Project>
<Name>vGenInterfaceWrap</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
4 changes: 2 additions & 2 deletions vGenWrap/vGenInterfaceWrap.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>$(SolutionDir)Win32\$(Configuration)\</OutputPath>
<OutputPath>..\Win32\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>None</DebugType>
Expand All @@ -91,7 +91,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\</OutputPath>
<OutputPath>..\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>None</DebugType>
Expand Down
Binary file modified x64/Release/vGenInterface.dll
Binary file not shown.

0 comments on commit 73e18ea

Please sign in to comment.