diff options
| author | Justin Berger <j.david.berger@gmail.com> | 2018-04-03 23:44:14 -0600 |
|---|---|---|
| committer | Justin Berger <j.david.berger@gmail.com> | 2018-04-03 23:44:14 -0600 |
| commit | c7d9d271796b20f886e2441de852498ecb25ca82 (patch) | |
| tree | 5929c2793c33c80e5392982a9baaa8d5ccaca724 /winbuild | |
| parent | fe025b0ff6bfb440da7cec8f388fa951910a86f0 (diff) | |
| parent | 6a45298c9bc34aac59cc2ebb9de2d82c7a42756e (diff) | |
| download | libsurvive-c7d9d271796b20f886e2441de852498ecb25ca82.tar.gz libsurvive-c7d9d271796b20f886e2441de852498ecb25ca82.tar.bz2 | |
Merge branch 'master' into imu
Diffstat (limited to 'winbuild')
| -rw-r--r-- | winbuild/libsurvive/libsurvive.def | 30 | ||||
| -rw-r--r-- | winbuild/libsurvive/libsurvive.vcxproj | 4 | ||||
| -rw-r--r-- | winbuild/libsurvive/libsurvive.vcxproj.filters | 1 | ||||
| -rw-r--r-- | winbuild/test/test.vcxproj | 2 |
4 files changed, 3 insertions, 34 deletions
diff --git a/winbuild/libsurvive/libsurvive.def b/winbuild/libsurvive/libsurvive.def deleted file mode 100644 index 3a50ce6..0000000 --- a/winbuild/libsurvive/libsurvive.def +++ /dev/null @@ -1,30 +0,0 @@ -LIBRARY LIBSURVIVE -EXPORTS - survive_verify_FLT_size - survive_init_internal - survive_startup - survive_poll - survive_close - survive_configi - survive_configs - survive_install_light_fn - survive_install_imu_fn - survive_install_angle_fn - survive_install_htc_config_fn - survive_send_magic - survive_cal_install - survive_cal_get_status - survive_default_light_process - survive_default_imu_process - survive_default_angle_process - survive_install_button_fn - survive_install_raw_pose_fn - survive_install_lighthouse_pose_fn - survive_get_so_by_name - survive_haptic - survive_default_button_process - survive_default_raw_pose_process - survive_default_lighthouse_pose_process - quatnormalize - quatrotatevector -
\ No newline at end of file diff --git a/winbuild/libsurvive/libsurvive.vcxproj b/winbuild/libsurvive/libsurvive.vcxproj index 5caa159..4b76c99 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj +++ b/winbuild/libsurvive/libsurvive.vcxproj @@ -91,7 +91,8 @@ <GenerateMapFile>true</GenerateMapFile> <MapFileName>$(IntDir)Test.txt</MapFileName> <MapExports>true</MapExports> - <ModuleDefinitionFile>$(MSBuildProjectDirectory)\libsurvive.def</ModuleDefinitionFile> + <ModuleDefinitionFile> + </ModuleDefinitionFile> </Link> <ProjectReference /> <Lib> @@ -213,7 +214,6 @@ <ClInclude Include="..\..\src\survive_internal.h" /> </ItemGroup> <ItemGroup> - <None Include="libsurvive.def" /> <None Include="packages.config"> <SubType>Designer</SubType> </None> diff --git a/winbuild/libsurvive/libsurvive.vcxproj.filters b/winbuild/libsurvive/libsurvive.vcxproj.filters index ffddee9..1f98c68 100644 --- a/winbuild/libsurvive/libsurvive.vcxproj.filters +++ b/winbuild/libsurvive/libsurvive.vcxproj.filters @@ -190,7 +190,6 @@ </ClInclude> </ItemGroup> <ItemGroup> - <None Include="libsurvive.def" /> <None Include="packages.config" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/winbuild/test/test.vcxproj b/winbuild/test/test.vcxproj index 5ceff3d..8df96d3 100644 --- a/winbuild/test/test.vcxproj +++ b/winbuild/test/test.vcxproj @@ -95,7 +95,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <AdditionalDependencies>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;libblas.lib;liblapacke.lib;liblapack.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>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)</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> |