From: Michal Maly Date: Thu, 11 May 2017 10:00:40 +0000 (+0200) Subject: - Do not enforce the "lib" prefix on Windows X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=e58d4d2eaffdbb3ac3dd073bbfff57d5d9ad72db;p=libHPCS.git - Do not enforce the "lib" prefix on Windows - Fix test_tool build on Windows - Remove the VS2013 project files --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ce2d6d9..0a7cffd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,10 +46,6 @@ set_target_properties(HPCS PROPERTIES VERSION 5.0 SOVERSION 5.0 PUBLIC_HEADER "${PROJECT_SOURCE_DIR}/include/libHPCS.h") -if (MSVC) - set_target_properties(HPCS - PROPERTIES PREFIX "lib") -endif() if (NOT WIN32) install(TARGETS HPCS @@ -61,10 +57,9 @@ else() PUBLIC_HEADER DESTINATION include) endif() - if (BUILD_TEST_TOOL) set(libHPCS_test_SRCS - test_tool.c) + src/test_tool.c) add_executable(test_tool ${libHPCS_test_SRCS}) target_link_libraries(test_tool HPCS) diff --git a/VS2013/libHPCS/libHPCS.sln b/VS2013/libHPCS/libHPCS.sln deleted file mode 100644 index e07e896..0000000 --- a/VS2013/libHPCS/libHPCS.sln +++ /dev/null @@ -1,39 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libHPCS", "libHPCS.vcxproj", "{5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_tool", "..\test_tool\test_tool.vcxproj", "{3F415811-5359-48A6-9729-34BB4A3D7DDA}" - ProjectSection(ProjectDependencies) = postProject - {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6} = {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug with test_tool|Win32 = Debug with test_tool|Win32 - Debug|Win32 = Debug|Win32 - Release with test_tool|Win32 = Release with test_tool|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6}.Debug with test_tool|Win32.ActiveCfg = Debug with test_tool|Win32 - {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6}.Debug with test_tool|Win32.Build.0 = Debug with test_tool|Win32 - {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6}.Debug|Win32.ActiveCfg = Debug|Win32 - {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6}.Debug|Win32.Build.0 = Debug|Win32 - {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6}.Release with test_tool|Win32.ActiveCfg = Release with test_tool|Win32 - {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6}.Release with test_tool|Win32.Build.0 = Release with test_tool|Win32 - {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6}.Release|Win32.ActiveCfg = Release|Win32 - {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6}.Release|Win32.Build.0 = Release|Win32 - {3F415811-5359-48A6-9729-34BB4A3D7DDA}.Debug with test_tool|Win32.ActiveCfg = Debug with test_tool|Win32 - {3F415811-5359-48A6-9729-34BB4A3D7DDA}.Debug with test_tool|Win32.Build.0 = Debug with test_tool|Win32 - {3F415811-5359-48A6-9729-34BB4A3D7DDA}.Debug|Win32.ActiveCfg = Debug|Win32 - {3F415811-5359-48A6-9729-34BB4A3D7DDA}.Release with test_tool|Win32.ActiveCfg = Release with test_tool|Win32 - {3F415811-5359-48A6-9729-34BB4A3D7DDA}.Release with test_tool|Win32.Build.0 = Release with test_tool|Win32 - {3F415811-5359-48A6-9729-34BB4A3D7DDA}.Release|Win32.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/VS2013/libHPCS/libHPCS.vcxproj b/VS2013/libHPCS/libHPCS.vcxproj deleted file mode 100644 index 39289b8..0000000 --- a/VS2013/libHPCS/libHPCS.vcxproj +++ /dev/null @@ -1,163 +0,0 @@ - - - - - Debug with test_tool - Win32 - - - Debug - Win32 - - - Release with test_tool - Win32 - - - Release - Win32 - - - - {5B9F8B15-85D5-4D5F-8F22-BB576E4CD4B6} - Win32Proj - libHPCS - - - - DynamicLibrary - true - v120_xp - Unicode - - - DynamicLibrary - true - v120_xp - Unicode - - - DynamicLibrary - false - v120_xp - true - MultiByte - - - DynamicLibrary - false - v120_xp - true - MultiByte - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBHPCS_EXPORTS;_HPCS_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - Windows - true - Shlwapi.lib;%(AdditionalDependencies) - 3.0 - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBHPCS_EXPORTS;_HPCS_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - Windows - true - Shlwapi.lib;%(AdditionalDependencies) - 3.0 - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBHPCS_EXPORTS;_HPCS_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - Shlwapi.lib;%(AdditionalDependencies) - 3.0 - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBHPCS_EXPORTS;_HPCS_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - Shlwapi.lib;%(AdditionalDependencies) - 3.0 - - - - - - - - - - - - - \ No newline at end of file diff --git a/VS2013/libHPCS/libHPCS.vcxproj.filters b/VS2013/libHPCS/libHPCS.vcxproj.filters deleted file mode 100644 index da1f24b..0000000 --- a/VS2013/libHPCS/libHPCS.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/src/test_tool.c b/src/test_tool.c index 7476205..658242c 100644 --- a/src/test_tool.c +++ b/src/test_tool.c @@ -2,7 +2,7 @@ #include #include #include -#include "include/libhpcs.h" +#include static int read_data(const char* path) {