Skip to content

Commit 64505e4

Browse files
committed
Build working
1 parent 12e8ff6 commit 64505e4

File tree

766 files changed

+212998
-30
lines changed

Some content is hidden

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

766 files changed

+212998
-30
lines changed

VisualStudio/bin

1020 KB
Binary file not shown.

VisualStudio/vs2017/ARToolKit5.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ Global
388388
{8FA21D52-6CE2-4F22-84CE-04F7E390EBC6}.Debug|Win32.ActiveCfg = Debug|Win32
389389
{8FA21D52-6CE2-4F22-84CE-04F7E390EBC6}.Debug|Win32.Build.0 = Debug|Win32
390390
{8FA21D52-6CE2-4F22-84CE-04F7E390EBC6}.Debug|x64.ActiveCfg = Debug|Win32
391+
{8FA21D52-6CE2-4F22-84CE-04F7E390EBC6}.Debug|x64.Build.0 = Debug|Win32
391392
{8FA21D52-6CE2-4F22-84CE-04F7E390EBC6}.Debug-StaticCRuntime|Mixed Platforms.ActiveCfg = Debug|Win32
392393
{8FA21D52-6CE2-4F22-84CE-04F7E390EBC6}.Debug-StaticCRuntime|Mixed Platforms.Build.0 = Debug|Win32
393394
{8FA21D52-6CE2-4F22-84CE-04F7E390EBC6}.Debug-StaticCRuntime|Win32.ActiveCfg = Debug|Win32

VisualStudio/vs2017/ARUtil.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<ClCompile>
147147
<Optimization>Disabled</Optimization>
148148
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\win64-x64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
149-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149+
<PreprocessorDefinitions>WIN32;HAVE_STRUCT_TIMESPEC</PreprocessorDefinitions>
150150
<MinimalRebuild>false</MinimalRebuild>
151151
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
152152
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -162,7 +162,7 @@
162162
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
163163
<ClCompile>
164164
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
165-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
165+
<PreprocessorDefinitions>WIN32;HAVE_STRUCT_TIMESPEC</PreprocessorDefinitions>
166166
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
167167
<PrecompiledHeader>
168168
</PrecompiledHeader>
@@ -177,7 +177,7 @@
177177
<ClCompile>
178178
<Optimization>Disabled</Optimization>
179179
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
180-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180+
<PreprocessorDefinitions>WIN32;HAVE_STRUCT_TIMESPEC</PreprocessorDefinitions>
181181
<MinimalRebuild>false</MinimalRebuild>
182182
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
183183
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -193,7 +193,7 @@
193193
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-StaticCRuntime|Win32'">
194194
<ClCompile>
195195
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
196-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
196+
<PreprocessorDefinitions>WIN32;HAVE_STRUCT_TIMESPEC</PreprocessorDefinitions>
197197
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
198198
<PrecompiledHeader>
199199
</PrecompiledHeader>

VisualStudio/vs2017/ARWrapper.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<ClCompile>
8585
<Optimization>Disabled</Optimization>
8686
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\win32-i386;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87-
<PreprocessorDefinitions>HAVE_NFT;WIN32;_DEBUG;_WINDOWS;_USRDLL;ARTOOLKIT5UNITY_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
87+
<PreprocessorDefinitions>HAVE_NFT;WIN32;__STDC_LIMIT_MACROS;HAVE_STRUCT_TIMESPEC</PreprocessorDefinitions>
8888
<MinimalRebuild>true</MinimalRebuild>
8989
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9090
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
9696
</ClCompile>
9797
<Link>
9898
<AdditionalDependencies>ARd.lib;ARgsub_lited.lib;ARVideod.lib;ARMultid.lib;ARICPd.lib;AR2d.lib;KPMd.lib;ARUtild.lib;zlib.lib;pthreadVC2.lib;opengl32.lib;glu32.lib;libjpeg.lib;%(AdditionalDependencies)</AdditionalDependencies>
99-
<AdditionalLibraryDirectories>..\..\lib\win32-i386;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
99+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\win32-i386;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
100100
<GenerateDebugInformation>true</GenerateDebugInformation>
101101
<SubSystem>Windows</SubSystem>
102102
<TargetMachine>MachineX86</TargetMachine>
@@ -139,7 +139,7 @@
139139
<Optimization>MaxSpeed</Optimization>
140140
<IntrinsicFunctions>true</IntrinsicFunctions>
141141
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\include\win32-i386;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
142-
<PreprocessorDefinitions>HAVE_NFT;WIN32;NDEBUG;_WINDOWS;_USRDLL;ARTOOLKIT5UNITY_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
142+
<PreprocessorDefinitions>HAVE_NFT;WIN32;__STDC_LIMIT_MACROS;HAVE_STRUCT_TIMESPEC</PreprocessorDefinitions>
143143
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
144144
<FunctionLevelLinking>true</FunctionLevelLinking>
145145
<PrecompiledHeader>
@@ -150,7 +150,7 @@
150150
</ClCompile>
151151
<Link>
152152
<AdditionalDependencies>AR.lib;ARgsub_lite.lib;ARVideo.lib;ARMulti.lib;ARICP.lib;AR2.lib;KPM.lib;ARUtil.lib;zlib.lib;pthreadVC2.lib;opengl32.lib;glu32.lib;libjpeg.lib;%(AdditionalDependencies)</AdditionalDependencies>
153-
<AdditionalLibraryDirectories>..\..\lib\win32-i386;..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
153+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\win32-i386;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
154154
<SubSystem>Windows</SubSystem>
155155
<OptimizeReferences>true</OptimizeReferences>
156156
<EnableCOMDATFolding>true</EnableCOMDATFolding>

VisualStudio/vs2017/Eden.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<ClCompile>
8383
<Optimization>Disabled</Optimization>
8484
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
85-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
85+
<PreprocessorDefinitions>WIN32;HAVE_STRUCT_TIMESPEC</PreprocessorDefinitions>
8686
<MinimalRebuild>false</MinimalRebuild>
8787
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8888
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -109,7 +109,7 @@
109109
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
110110
<ClCompile>
111111
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
112-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112+
<PreprocessorDefinitions>WIN32;HAVE_STRUCT_TIMESPEC</PreprocessorDefinitions>
113113
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
114114
<DebugInformationFormat>
115115
</DebugInformationFormat>

VisualStudio/vs2017/check_id.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5353
<ClCompile>
5454
<Optimization>Disabled</Optimization>
55-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win64-x64;$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
56-
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
55+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
56+
<PreprocessorDefinitions>WIN32</PreprocessorDefinitions>
5757
<MinimalRebuild>true</MinimalRebuild>
5858
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
5959
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -64,7 +64,7 @@
6464
</ClCompile>
6565
<Link>
6666
<AdditionalDependencies>ARd.lib;ARICPd.lib;ARgsub_lited.lib;ARMultid.lib;ARvideod.lib;ARUtild.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
67-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\win64-x64;$(ProjectDir)..\..\lib\win32-i386;$(ProjectDir)..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
67+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\win32-i386;$(ProjectDir)..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
6868
<GenerateDebugInformation>true</GenerateDebugInformation>
6969
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
7070
<SubSystem>Console</SubSystem>
@@ -81,7 +81,7 @@
8181
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8282
<ClCompile>
8383
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
84-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
84+
<PreprocessorDefinitions>WIN32</PreprocessorDefinitions>
8585
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8686
<PrecompiledHeader>
8787
</PrecompiledHeader>

VisualStudio/vs2017/mk_patt.vcxproj

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,19 @@
8181
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8282
<ClCompile>
8383
<Optimization>Disabled</Optimization>
84-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win64-x64;$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
84+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include</AdditionalIncludeDirectories>
8585
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8686
<MinimalRebuild>true</MinimalRebuild>
8787
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8888
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8989
<PrecompiledHeader>
9090
</PrecompiledHeader>
9191
<WarningLevel>Level3</WarningLevel>
92-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
92+
<DebugInformationFormat>None</DebugInformationFormat>
9393
</ClCompile>
9494
<Link>
9595
<AdditionalDependencies>ARd.lib;ARICPd.lib;ARgsubd.lib;ARvideod.lib;ARUtild.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
96-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\win64-x64;$(ProjectDir)..\..\lib\win32-i386;$(ProjectDir)..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
96+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\win32-i386</AdditionalLibraryDirectories>
9797
<GenerateDebugInformation>true</GenerateDebugInformation>
9898
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
9999
<SubSystem>Console</SubSystem>
@@ -136,18 +136,17 @@
136136
</ItemDefinitionGroup>
137137
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
138138
<ClCompile>
139-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
139+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include\win32-i386;$(ProjectDir)..\..\include</AdditionalIncludeDirectories>
140140
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141141
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
142142
<PrecompiledHeader>
143143
</PrecompiledHeader>
144144
<WarningLevel>Level3</WarningLevel>
145-
<DebugInformationFormat>
146-
</DebugInformationFormat>
145+
<DebugInformationFormat>None</DebugInformationFormat>
147146
</ClCompile>
148147
<Link>
149148
<AdditionalDependencies>AR.lib;ARICP.lib;ARgsub.lib;ARvideo.lib;ARUtil.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
150-
<AdditionalLibraryDirectories>$(ProjectDir)..\..\lib\win32-i386;$(ProjectDir)..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
149+
<AdditionalLibraryDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\win32-i386</AdditionalLibraryDirectories>
151150
<GenerateDebugInformation>false</GenerateDebugInformation>
152151
<SubSystem>Console</SubSystem>
153152
<OptimizeReferences>true</OptimizeReferences>

include/AR/videoRGBA.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
#ifndef __ARvideo_videoRGBA_h__
3939
#define __ARvideo_videoRGBA_h__
4040

41-
#include <AR/ar.h>
41+
#include <AR/video.h>
4242

4343
#ifdef __cplusplus
4444
extern "C" {
4545
#endif
4646

47-
int videoRGBA(uint32_t *destRGBA, AR2VideoBufferT *source, int width, int height, AR_PIXEL_FORMAT pixelFormat);
48-
int videoBGRA(uint32_t *destBGRA, AR2VideoBufferT *source, int width, int height, AR_PIXEL_FORMAT pixelFormat);
47+
AR_DLL_API int videoRGBA(uint32_t *destRGBA, AR2VideoBufferT *source, int width, int height, AR_PIXEL_FORMAT pixelFormat);
48+
AR_DLL_API int videoBGRA(uint32_t *destBGRA, AR2VideoBufferT *source, int width, int height, AR_PIXEL_FORMAT pixelFormat);
4949

5050
#ifdef __cplusplus
5151
}
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* ColorConversion.h
3+
* ARToolKit5
4+
*
5+
* This file is part of ARToolKit.
6+
*
7+
* ARToolKit is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU Lesser General Public License as published by
9+
* the Free Software Foundation, either version 3 of the License, or
10+
* (at your option) any later version.
11+
*
12+
* ARToolKit is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public License
18+
* along with ARToolKit. If not, see <http://www.gnu.org/licenses/>.
19+
*
20+
* As a special exception, the copyright holders of this library give you
21+
* permission to link this library with independent modules to produce an
22+
* executable, regardless of the license terms of these independent modules, and to
23+
* copy and distribute the resulting executable under terms of your choice,
24+
* provided that you also meet, for each linked independent module, the terms and
25+
* conditions of the license of that module. An independent module is a module
26+
* which is neither derived from nor based on this library. If you modify this
27+
* library, you may extend this exception to your version of the library, but you
28+
* are not obligated to do so. If you do not wish to do so, delete this exception
29+
* statement from your version.
30+
*
31+
* Copyright 2015 Daqri, LLC.
32+
* Copyright 2010-2015 ARToolworks, Inc.
33+
*
34+
* Author(s): Julian Looser, Philip Lamb
35+
*
36+
*/
37+
38+
#ifndef COLORCONVERSION_H
39+
#define COLORCONVERSION_H
40+
41+
void color_convert_common(unsigned char *pY, unsigned char *pUV, int width, int height, unsigned char *buffer);
42+
43+
#endif // !COLORCONVERSION_H

include/Eden/EdenTime.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ extern "C" {
6969
#if defined(EDEN_UNIX)
7070
# include <sys/time.h> // struct timespec, struct timeval, gettimeofday()
7171
#else
72-
# ifndef PTHREAD_H // pthreads_win32 also defines struct timespec.
73-
//struct timespec {
74-
// long tv_sec;
75-
// long tv_nsec;
76-
//};
72+
# ifndef HAVE_STRUCT_TIMESPEC // pthreads_win32 also defines struct timespec.
73+
struct timespec {
74+
long tv_sec;
75+
long tv_nsec;
76+
};
7777
# endif // !PTHREAD_H
7878
#endif
7979

0 commit comments

Comments
 (0)