From c1f59615f9639bae75cd0e1a7cffe118ac6a7b41 Mon Sep 17 00:00:00 2001 From: Justin Berger Date: Sat, 7 Apr 2018 07:37:50 -0600 Subject: Updated winbuild to include imu tracker --- winbuild/calibrate/calibrate.vcxproj | 82 ++++++++++++++++++++++++++ winbuild/data_recorder/data_recorder.vcxproj | 78 ++++++++++++++++++++++++ winbuild/libsurvive.sln | 3 + winbuild/libsurvive/libsurvive.vcxproj | 71 +++++++++++++++++++++- winbuild/libsurvive/libsurvive.vcxproj.filters | 3 + winbuild/test/test.vcxproj | 78 ++++++++++++++++++++++++ 6 files changed, 313 insertions(+), 2 deletions(-) (limited to 'winbuild') diff --git a/winbuild/calibrate/calibrate.vcxproj b/winbuild/calibrate/calibrate.vcxproj index d0b1c48..feb72fd 100644 --- a/winbuild/calibrate/calibrate.vcxproj +++ b/winbuild/calibrate/calibrate.vcxproj @@ -17,6 +17,14 @@ Release x64 + + RelWDebInfo + Win32 + + + RelWDebInfo + x64 + 15.0 @@ -39,6 +47,13 @@ true MultiByte + + Application + false + v141 + true + MultiByte + Application true @@ -52,6 +67,13 @@ true MultiByte + + Application + false + v141 + true + MultiByte + @@ -63,12 +85,18 @@ + + + + + + true @@ -80,9 +108,15 @@ false + + false + false + + false + @@ -152,6 +186,30 @@ true + + + Level3 + + + MaxSpeed + true + true + USE_DOUBLE;RUNTIME_SYMNUMX;HIDAPI;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\windows;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories) + + + Console + true + true + + + setupapi.lib;dbghelp.lib;%(AdditionalDependencies) + true + + + true + + Level3 @@ -176,6 +234,30 @@ true + + + Level3 + + + MaxSpeed + true + true + USE_DOUBLE;RUNTIME_SYMNUMX;HIDAPI;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\windows;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories) + + + Console + true + true + + + setupapi.lib;dbghelp.lib;%(AdditionalDependencies) + true + + + true + + diff --git a/winbuild/data_recorder/data_recorder.vcxproj b/winbuild/data_recorder/data_recorder.vcxproj index e63d474..9f3f86a 100644 --- a/winbuild/data_recorder/data_recorder.vcxproj +++ b/winbuild/data_recorder/data_recorder.vcxproj @@ -17,6 +17,14 @@ Release x64 + + RelWDebInfo + Win32 + + + RelWDebInfo + x64 + 15.0 @@ -39,6 +47,13 @@ true MultiByte + + Application + false + v141 + true + MultiByte + Application true @@ -52,6 +67,13 @@ true MultiByte + + Application + false + v141 + true + MultiByte + @@ -63,12 +85,18 @@ + + + + + + true @@ -80,9 +108,15 @@ false + + false + false + + false + @@ -143,6 +177,28 @@ true + + + Level3 + + + MaxSpeed + true + true + USE_DOUBLE;HIDAPI;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\windows;..\..\include\libsurvive;..\..\redist; + + + Console + true + true + setupapi.lib;dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + true + + + true + + Level3 @@ -165,6 +221,28 @@ true + + + Level3 + + + MaxSpeed + true + true + USE_DOUBLE;HIDAPI;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\windows;..\..\include\libsurvive;..\..\redist; + + + Console + true + true + setupapi.lib;dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + true + + + true + + {435cfd2c-8724-42ee-8fde-71ef7d2c6b2f} diff --git a/winbuild/libsurvive.sln b/winbuild/libsurvive.sln index b525975..3a8b2da 100644 --- a/winbuild/libsurvive.sln +++ b/winbuild/libsurvive.sln @@ -55,4 +55,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5C1AB415-DC8F-42C0-B2E0-7300D0C79E09} + EndGlobalSection EndGlobal diff --git a/winbuild/libsurvive/libsurvive.vcxproj b/winbuild/libsurvive/libsurvive.vcxproj index 4b76c99..520279c 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj +++ b/winbuild/libsurvive/libsurvive.vcxproj @@ -17,6 +17,14 @@ Release x64 + + RelWDebInfo + Win32 + + + RelWDebInfo + x64 + 15.0 @@ -39,6 +47,13 @@ true MultiByte + + StaticLibrary + false + v141 + true + MultiByte + DynamicLibrary true @@ -46,7 +61,14 @@ MultiByte - StaticLibrary + DynamicLibrary + false + v141 + true + MultiByte + + + DynamicLibrary false v141 true @@ -64,12 +86,18 @@ + + + + + + $(IncludePath) @@ -132,6 +160,24 @@ + + + Level3 + + + MaxSpeed + true + true + USE_DOUBLE;RUNTIME_SYMNUM;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories) + + + Windows + true + true + + + Level3 @@ -140,13 +186,33 @@ MaxSpeed true true - USE_DOUBLE;RUNTIME_SYMNUM;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;NDEBUG;_LIB;%(PreprocessorDefinitions) + FLT=double;USE_DOUBLE;MANUAL_REGISTRATION;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;_DEBUG;_LIB;HAVE_LAPACK_CONFIG_H;LAPACK_COMPLEX_STRUCTURE;%(PreprocessorDefinitions) ..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories) Windows true true + DbgHelp.lib;SetupAPI.lib;%(AdditionalDependencies) + + + + + + Level3 + + + MaxSpeed + true + true + FLT=double;USE_DOUBLE;MANUAL_REGISTRATION;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;_DEBUG;_LIB;HAVE_LAPACK_CONFIG_H;LAPACK_COMPLEX_STRUCTURE;%(PreprocessorDefinitions) + ..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories) + + + Windows + true + true + DbgHelp.lib;SetupAPI.lib;%(AdditionalDependencies) @@ -184,6 +250,7 @@ + diff --git a/winbuild/libsurvive/libsurvive.vcxproj.filters b/winbuild/libsurvive/libsurvive.vcxproj.filters index 1f98c68..d06f083 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj.filters +++ b/winbuild/libsurvive/libsurvive.vcxproj.filters @@ -135,6 +135,9 @@ Source Files + + Source Files + diff --git a/winbuild/test/test.vcxproj b/winbuild/test/test.vcxproj index 8df96d3..ae130b4 100644 --- a/winbuild/test/test.vcxproj +++ b/winbuild/test/test.vcxproj @@ -17,6 +17,14 @@ Release x64 + + RelWDebInfo + Win32 + + + RelWDebInfo + x64 + 15.0 @@ -39,6 +47,13 @@ true Unicode + + Application + false + v141 + true + Unicode + Application true @@ -52,6 +67,13 @@ true Unicode + + Application + false + v141 + true + Unicode + @@ -63,12 +85,18 @@ + + + + + + true @@ -81,9 +109,15 @@ false + + false + false + + false + @@ -144,6 +178,28 @@ true + + + Level3 + + + MaxSpeed + true + true + USE_DOUBLE;HIDAPI;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\windows;..\..\include\libsurvive;..\..\redist; + + + Console + true + true + setupapi.lib;dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + true + + + true + + Level3 @@ -166,6 +222,28 @@ true + + + Level3 + + + MaxSpeed + true + true + USE_DOUBLE;HIDAPI;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\windows;..\..\include\libsurvive;..\..\redist; + + + Console + true + true + setupapi.lib;dbghelp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + true + + + true + + {435cfd2c-8724-42ee-8fde-71ef7d2c6b2f} -- cgit v1.2.3 From b792a65dbfbb304927400ca6c754195d92089b61 Mon Sep 17 00:00:00 2001 From: Justin Berger Date: Sat, 7 Apr 2018 08:46:50 -0600 Subject: Fixed 32 bit linker issue --- winbuild/libsurvive/libsurvive.vcxproj | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'winbuild') diff --git a/winbuild/libsurvive/libsurvive.vcxproj b/winbuild/libsurvive/libsurvive.vcxproj index 520279c..fb1b9a5 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj +++ b/winbuild/libsurvive/libsurvive.vcxproj @@ -41,14 +41,14 @@ MultiByte - StaticLibrary + DynamicLibrary false v141 true MultiByte - StaticLibrary + DynamicLibrary false v141 true @@ -117,7 +117,7 @@ Windows DbgHelp.lib;SetupAPI.lib;%(AdditionalDependencies) true - $(IntDir)Test.txt + libsurvive.map true @@ -134,11 +134,15 @@ Level3 Disabled - USE_DOUBLE;RUNTIME_SYMNUM;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + FLT=double;USE_DOUBLE;MANUAL_REGISTRATION;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;_DEBUG;_LIB;HAVE_LAPACK_CONFIG_H;LAPACK_COMPLEX_STRUCTURE;%(PreprocessorDefinitions) ..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories) Windows + DbgHelp.lib;SetupAPI.lib;%(AdditionalDependencies) + true + true + libsurvive.map @@ -150,13 +154,17 @@ MaxSpeed true true - USE_DOUBLE;RUNTIME_SYMNUM;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + FLT=double;USE_DOUBLE;MANUAL_REGISTRATION;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;_DEBUG;_LIB;HAVE_LAPACK_CONFIG_H;LAPACK_COMPLEX_STRUCTURE;%(PreprocessorDefinitions) ..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories) Windows true true + DbgHelp.lib;SetupAPI.lib;%(AdditionalDependencies) + true + true + libsurvive.map @@ -168,13 +176,17 @@ MaxSpeed true true - USE_DOUBLE;RUNTIME_SYMNUM;RUNTIME_SYMNUMX;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + FLT=double;USE_DOUBLE;MANUAL_REGISTRATION;NOZLIB;_CRT_SECURE_NO_WARNINGS;HIDAPI;WINDOWS;_DEBUG;_LIB;HAVE_LAPACK_CONFIG_H;LAPACK_COMPLEX_STRUCTURE;%(PreprocessorDefinitions) ..\..\winbuild;..\..\include\libsurvive;..\..\redist;%(AdditionalIncludeDirectories) Windows true true + DbgHelp.lib;SetupAPI.lib;%(AdditionalDependencies) + true + true + libsurvive.map @@ -194,6 +206,9 @@ true true DbgHelp.lib;SetupAPI.lib;%(AdditionalDependencies) + true + true + libsurvive.map @@ -213,6 +228,9 @@ true true DbgHelp.lib;SetupAPI.lib;%(AdditionalDependencies) + true + true + libsurvive.map -- cgit v1.2.3 From 7f4385538d6b19ea5dd3f00c4a0eb49385798031 Mon Sep 17 00:00:00 2001 From: Justin Berger Date: Mon, 9 Apr 2018 09:33:40 -0600 Subject: Made new posers work in windows --- winbuild/libsurvive/libsurvive.vcxproj | 6 ++++++ winbuild/libsurvive/libsurvive.vcxproj.filters | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) (limited to 'winbuild') diff --git a/winbuild/libsurvive/libsurvive.vcxproj b/winbuild/libsurvive/libsurvive.vcxproj index fb1b9a5..8a0aaf1 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj +++ b/winbuild/libsurvive/libsurvive.vcxproj @@ -244,6 +244,7 @@ + @@ -254,10 +255,13 @@ + + + @@ -288,11 +292,13 @@ + + diff --git a/winbuild/libsurvive/libsurvive.vcxproj.filters b/winbuild/libsurvive/libsurvive.vcxproj.filters index d06f083..019631b 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj.filters +++ b/winbuild/libsurvive/libsurvive.vcxproj.filters @@ -138,6 +138,18 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -191,6 +203,12 @@ Source Files + + Source Files + + + Source Files + -- cgit v1.2.3