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/libsurvive/libsurvive.vcxproj | 71 +++++++++++++++++++++++++- winbuild/libsurvive/libsurvive.vcxproj.filters | 3 ++ 2 files changed, 72 insertions(+), 2 deletions(-) (limited to 'winbuild/libsurvive') 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 + -- 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/libsurvive') 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/libsurvive') 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