Skip to content

Commit f872a3f

Browse files
authored
Merge pull request #1 from ThorstenBux/win-build
Win build
2 parents 47e0100 + 4d1f3c2 commit f872a3f

File tree

1,499 files changed

+336088
-18906
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,499 files changed

+336088
-18906
lines changed

.gitignore

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,6 @@ bin64/opencv_imgproc2410.dll
144144
bin64/vcredist_x64.exe
145145
bin64/pthreadVC2.dll
146146

147-
bin-winrt-w8_1-arm/
148-
bin-winrt-w8_1-x86/
149-
bin-winrt-w8_1-x64/
150-
bin-winrt-wp8_1-arm/
151-
bin-winrt-wp8_1-x86/
152-
lib/winrt-w8_1-arm/
153-
lib/winrt-w8_1-x86/
154-
lib/winrt-w8_1-x64/
155-
lib/winrt-wp8_1-arm/
156-
lib/winrt-wp8_1-x86/
157-
158147
# Android build products.
159148
android/obj/local/**/objs/
160149
android/obj/local/**/objs-debug/
@@ -182,15 +171,11 @@ AndroidStudioProjects/**/obj
182171
AndroidStudioProjects/**/build
183172

184173
# Visual Studio build files.
185-
VisualStudio/vs120/Debug/
186-
VisualStudio/vs120/Debug-StaticCRuntime/
187-
VisualStudio/vs120/Release/
188-
VisualStudio/vs120/Release-StaticCRuntime/
189-
VisualStudio/vs120/x64/
190-
VisualStudio/vs120-winrt/**/ARM/
191-
VisualStudio/vs120-winrt/**/Generated Files/
192-
VisualStudio/vs120-winrt/**/Win32/
193-
VisualStudio/vs120-winrt/**/x64/
174+
VisualStudio/vs2017/Debug/
175+
VisualStudio/vs2017/Debug-StaticCRuntime/
176+
VisualStudio/vs2017/Release/
177+
VisualStudio/vs2017/Release-StaticCRuntime/
178+
VisualStudio/vs2017/x64/
194179

195180
# Symlinks in OS X builds.
196181
bin/libopencv_*.dylib
@@ -208,21 +193,10 @@ lib/SRC/ARgsubD3D/ARgsubD3D.WindowsPhone/ARM/Release/*
208193
lib/SRC/ARgsubD3D/ARgsubD3D.Windows/ARM/Release/*
209194
lib/SRC/ARgsubD3D/ARgsubD3D.Windows/x64/Release/*
210195

211-
# WinRT samples
212-
examples/simpleLiteWinRT/simpleLiteWinRT.Windows/bin/*
213-
examples/simpleLiteWinRT/simpleLiteWinRT.Windows/obj/*
214-
examples/simpleLiteWinRT/simpleLiteWinRT.WindowsPhone/bin/*
215-
examples/simpleLiteWinRT/simpleLiteWinRT.WindowsPhone/obj/*
216-
examples/multiCubeWinRT/multiCubeWinRT.Windows/bin/*
217-
examples/multiCubeWinRT/multiCubeWinRT.Windows/obj/*
218-
examples/multiCubeWinRT/multiCubeWinRT.WindowsPhone/bin/*
219-
examples/multiCubeWinRT/multiCubeWinRT.WindowsPhone/obj/*
220-
examples/nftSimpleWinRT/nftSimpleWinRT.Windows/bin/*
221-
examples/nftSimpleWinRT/nftSimpleWinRT.Windows/obj/*
222-
examples/nftSimpleWinRT/nftSimpleWinRT.WindowsPhone/bin/*
223-
examples/nftSimpleWinRT/nftSimpleWinRT.WindowsPhone/obj/*
224-
examples/uiControlsWinRT/uiControlsWinRT.Windows/bin/*
225-
examples/uiControlsWinRT/uiControlsWinRT.Windows/obj/*
226-
examples/uiControlsWinRT/uiControlsWinRT.WindowsPhone/bin/*
227-
examples/uiControlsWinRT/uiControlsWinRT.WindowsPhone/obj/*
228-
196+
VisualStudio/vs2017/.vs/*
197+
lib/win64-x64/ARvideod.exp
198+
lib/win64-x64/ARosgd.exp
199+
*.exp
200+
*.ipdb
201+
.history/
202+
*.iobj

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
## Build state
44

5-
| macos | iOS | Android | Linux |
6-
| ----- | --- | ------- | ----- |
7-
| [![Build Status](https://www.bitrise.io/app/0fcc83b6b5389ae7/status.svg?token=OAvG_BbWsTEOoj82MCdomw&branch=master)](https://www.bitrise.io/app/0fcc83b6b5389ae7) | [![Build Status](https://www.bitrise.io/app/88666fe0601b8e16/status.svg?token=z0tclkckOxko56KsZEToBQ)](https://www.bitrise.io/app/88666fe0601b8e16) | [![Build Status](https://www.bitrise.io/app/effbb10a28315107/status.svg?token=7qiyYxXAgQUw_ohNYeafQg&branch=master)](https://www.bitrise.io/app/effbb10a28315107) | [![Build Status](https://www.bitrise.io/app/53ee3753545bf8b5/status.svg?token=Kk-_y3LNu_Y3exI-sOWC7Q&branch=master)](https://www.bitrise.io/app/53ee3753545bf8b5) |
5+
| macos | iOS | Android | Linux | Windows |
6+
| ----- | --- | ------- | ----- | ------- |
7+
| [![Build Status](https://www.bitrise.io/app/0fcc83b6b5389ae7/status.svg?token=OAvG_BbWsTEOoj82MCdomw&branch=master)](https://www.bitrise.io/app/0fcc83b6b5389ae7) | [![Build Status](https://www.bitrise.io/app/88666fe0601b8e16/status.svg?token=z0tclkckOxko56KsZEToBQ)](https://www.bitrise.io/app/88666fe0601b8e16) | [![Build Status](https://www.bitrise.io/app/effbb10a28315107/status.svg?token=7qiyYxXAgQUw_ohNYeafQg&branch=master)](https://www.bitrise.io/app/effbb10a28315107) | [![Build Status](https://www.bitrise.io/app/53ee3753545bf8b5/status.svg?token=Kk-_y3LNu_Y3exI-sOWC7Q&branch=master)](https://www.bitrise.io/app/53ee3753545bf8b5) | <img src="https://thor-bux.visualstudio.com/_apis/public/build/definitions/f05f7a2f-6433-463e-9dc0-1c02505d8294/6/badge"> |
88
## Contents
99

1010
- About this archive

VisualStudio/vs120-winrt/AR.Shared/AR.Shared.vcxitems

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)