Skip to content

Commit

Permalink
Update Win build to VS 2017
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThorstenBux
ThorstenBux committed Dec 7, 2017
1 parent 784e3cf commit 27fbc6d
Show file tree
Hide file tree
Showing 62 changed files with 7,202 additions and 6,706 deletions.
48 changes: 6 additions & 42 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,17 +144,6 @@ bin64/opencv_imgproc2410.dll
bin64/vcredist_x64.exe
bin64/pthreadVC2.dll

bin-winrt-w8_1-arm/
bin-winrt-w8_1-x86/
bin-winrt-w8_1-x64/
bin-winrt-wp8_1-arm/
bin-winrt-wp8_1-x86/
lib/winrt-w8_1-arm/
lib/winrt-w8_1-x86/
lib/winrt-w8_1-x64/
lib/winrt-wp8_1-arm/
lib/winrt-wp8_1-x86/

# Android build products.
android/obj/local/**/objs/
android/obj/local/**/objs-debug/
Expand Down Expand Up @@ -182,15 +171,11 @@ AndroidStudioProjects/**/obj
AndroidStudioProjects/**/build

# Visual Studio build files.
VisualStudio/vs120/Debug/
VisualStudio/vs120/Debug-StaticCRuntime/
VisualStudio/vs120/Release/
VisualStudio/vs120/Release-StaticCRuntime/
VisualStudio/vs120/x64/
VisualStudio/vs120-winrt/**/ARM/
VisualStudio/vs120-winrt/**/Generated Files/
VisualStudio/vs120-winrt/**/Win32/
VisualStudio/vs120-winrt/**/x64/
VisualStudio/vs2017/Debug/
VisualStudio/vs2017/Debug-StaticCRuntime/
VisualStudio/vs2017/Release/
VisualStudio/vs2017/Release-StaticCRuntime/
VisualStudio/vs2017/x64/

# Symlinks in OS X builds.
bin/libopencv_*.dylib
Expand All @@ -208,27 +193,6 @@ lib/SRC/ARgsubD3D/ARgsubD3D.WindowsPhone/ARM/Release/*
lib/SRC/ARgsubD3D/ARgsubD3D.Windows/ARM/Release/*
lib/SRC/ARgsubD3D/ARgsubD3D.Windows/x64/Release/*

# WinRT samples
examples/simpleLiteWinRT/simpleLiteWinRT.Windows/bin/*
examples/simpleLiteWinRT/simpleLiteWinRT.Windows/obj/*
examples/simpleLiteWinRT/simpleLiteWinRT.WindowsPhone/bin/*
examples/simpleLiteWinRT/simpleLiteWinRT.WindowsPhone/obj/*
examples/multiCubeWinRT/multiCubeWinRT.Windows/bin/*
examples/multiCubeWinRT/multiCubeWinRT.Windows/obj/*
examples/multiCubeWinRT/multiCubeWinRT.WindowsPhone/bin/*
examples/multiCubeWinRT/multiCubeWinRT.WindowsPhone/obj/*
examples/nftSimpleWinRT/nftSimpleWinRT.Windows/bin/*
examples/nftSimpleWinRT/nftSimpleWinRT.Windows/obj/*
examples/nftSimpleWinRT/nftSimpleWinRT.WindowsPhone/bin/*
examples/nftSimpleWinRT/nftSimpleWinRT.WindowsPhone/obj/*
examples/uiControlsWinRT/uiControlsWinRT.Windows/bin/*
examples/uiControlsWinRT/uiControlsWinRT.Windows/obj/*
examples/uiControlsWinRT/uiControlsWinRT.WindowsPhone/bin/*
examples/uiControlsWinRT/uiControlsWinRT.WindowsPhone/obj/*

VisualStudio/vs120/.vs/ARToolKit5/v15/Browse.VC.db
VisualStudio/vs120/.vs/ARToolKit5/v15/Solution.VC.db-wal
VisualStudio/vs120/.vs/ARToolKit5/v15/Solution.VC.db-shm
VisualStudio/vs120/.vs/ARToolKit5/v15/Solution.VC.db
VisualStudio/vs2017/.vs/*
lib/win64-x64/ARvideod.exp
lib/win64-x64/ARosgd.exp
450 changes: 225 additions & 225 deletions VisualStudio/vs120/AR.vcxproj → VisualStudio/vs2017/AR.vcxproj
View file

Large diffs are not rendered by default.

610 changes: 305 additions & 305 deletions VisualStudio/vs120/AR2.vcxproj → VisualStudio/vs2017/AR2.vcxproj
View file

Large diffs are not rendered by default.

592 changes: 296 additions & 296 deletions VisualStudio/vs120/ARICP.vcxproj → VisualStudio/vs2017/ARICP.vcxproj
View file

Large diffs are not rendered by default.

304 changes: 152 additions & 152 deletions VisualStudio/vs120/ARMulti.vcxproj → VisualStudio/vs2017/ARMulti.vcxproj
View file

Large diffs are not rendered by default.

532 changes: 532 additions & 0 deletions VisualStudio/vs2017/ARToolKit5-bin.sln
View file

Large diffs are not rendered by default.

1,786 changes: 893 additions & 893 deletions VisualStudio/vs120/ARToolKit5.sln → VisualStudio/vs2017/ARToolKit5.sln
View file

Large diffs are not rendered by default.

618 changes: 309 additions & 309 deletions VisualStudio/vs120/ARUtil.vcxproj → VisualStudio/vs2017/ARUtil.vcxproj
View file

Large diffs are not rendered by default.

444 changes: 222 additions & 222 deletions VisualStudio/vs120/ARWrapper.vcxproj → VisualStudio/vs2017/ARWrapper.vcxproj
View file

Large diffs are not rendered by default.

312 changes: 156 additions & 156 deletions VisualStudio/vs120/ARgsub.vcxproj → VisualStudio/vs2017/ARgsub.vcxproj
View file

Large diffs are not rendered by default.

272 changes: 136 additions & 136 deletions VisualStudio/vs120/ARgsub_lite.vcxproj → VisualStudio/vs2017/ARgsub_lite.vcxproj
View file

Large diffs are not rendered by default.

398 changes: 199 additions & 199 deletions VisualStudio/vs120/ARosg.vcxproj → VisualStudio/vs2017/ARosg.vcxproj
View file

Large diffs are not rendered by default.

430 changes: 215 additions & 215 deletions VisualStudio/vs120/ARvideo.vcxproj → VisualStudio/vs2017/ARvideo.vcxproj
View file

Large diffs are not rendered by default.

0 VisualStudio/vs120/ARvideo.vcxproj.filters → VisualStudio/vs2017/ARvideo.vcxproj.filters
View file
File renamed without changes.
114 changes: 57 additions & 57 deletions VisualStudio/vs120/Configure.vcxproj → VisualStudio/vs2017/Configure.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{752E008F-2349-4275-BCD9-A2D145AE055D}</ProjectGuid>
<Keyword>MakeFileProj</Keyword>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|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|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<NMakeBuildCommandLine>$(ComSpec) /C "START /WAIT WScript.exe $(ProjectDir)..\..\Configure-win32.vbs //NoLogo"</NMakeBuildCommandLine>
<NMakeOutput>$(ProjectDir)..\..\include\AR\config.h</NMakeOutput>
<NMakeCleanCommandLine>$(ComSpec) /C "DEL $(ProjectDir)..\..\include\AR\config.h"</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>$(ComSpec) /C "START /WAIT WScript.exe $(ProjectDir)..\..\Configure-win32.vbs //NoLogo"</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>$(ComSpec) /C "START /WAIT WScript.exe $(ProjectDir)..\..\Configure-win32.vbs //NoLogo"</NMakeBuildCommandLine>
<NMakeOutput>$(ProjectDir)..\..\include\AR\config.h</NMakeOutput>
<NMakeCleanCommandLine>$(ComSpec) /C "DEL $(ProjectDir)..\..\include\AR\config.h"</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>$(ComSpec) /C "START /WAIT WScript.exe $(ProjectDir)..\..\Configure-win32.vbs //NoLogo"</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemDefinitionGroup>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{752E008F-2349-4275-BCD9-A2D145AE055D}</ProjectGuid>
<Keyword>MakeFileProj</Keyword>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|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|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<NMakeBuildCommandLine>$(ComSpec) /C "START /WAIT WScript.exe $(ProjectDir)..\..\Configure-win32.vbs //NoLogo"</NMakeBuildCommandLine>
<NMakeOutput>$(ProjectDir)..\..\include\AR\config.h</NMakeOutput>
<NMakeCleanCommandLine>$(ComSpec) /C "DEL $(ProjectDir)..\..\include\AR\config.h"</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>$(ComSpec) /C "START /WAIT WScript.exe $(ProjectDir)..\..\Configure-win32.vbs //NoLogo"</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>$(ComSpec) /C "START /WAIT WScript.exe $(ProjectDir)..\..\Configure-win32.vbs //NoLogo"</NMakeBuildCommandLine>
<NMakeOutput>$(ProjectDir)..\..\include\AR\config.h</NMakeOutput>
<NMakeCleanCommandLine>$(ComSpec) /C "DEL $(ProjectDir)..\..\include\AR\config.h"</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>$(ComSpec) /C "START /WAIT WScript.exe $(ProjectDir)..\..\Configure-win32.vbs //NoLogo"</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemDefinitionGroup>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
Loading

0 comments on commit 27fbc6d

Please sign in to comment.