diff options
| author | Zezula Ladislav <ladislav.zezula@avast.com> | 2017-03-09 13:12:34 +0100 |
|---|---|---|
| committer | Zezula Ladislav <ladislav.zezula@avast.com> | 2017-03-09 13:12:34 +0100 |
| commit | 69c5b0682b6355e4ee6405b41ffa30330ebfa046 (patch) | |
| tree | c6571b89f056b4aa39aa863e1ade9953b1db3d5e | |
| parent | ee273364aa401f642953669035eb623bbefdf497 (diff) | |
+ Removed DEFINE from CMakeLists.txt
+ Fixed paths to include files
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | StormLib_vs12.vcxproj | 4 | ||||
| -rw-r--r-- | StormLib_vs15.vcxproj | 4 | ||||
| -rw-r--r-- | StormLib_vs15.vcxproj.filters | 12 |
4 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dbc23a3..9d421af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -292,7 +292,7 @@ option(BUILD_SHARED_LIBS "Compile shared libraries" OFF) add_library(${LIBRARY_NAME} ${SRC_FILES} ${SRC_ADDITIONAL_FILES}) target_link_libraries(${LIBRARY_NAME} ${LINK_LIBS}) -target_compile_definitions(${LIBRARY_NAME} PUBLIC -D__STORMLIB_SELF__) #CMake should take care of the linking +target_compile_definitions(${LIBRARY_NAME} PUBLIC) #CMake should take care of the linking target_include_directories(${LIBRARY_NAME} PUBLIC src/) set_target_properties(${LIBRARY_NAME} PROPERTIES PUBLIC_HEADER "src/StormLib.h;src/StormPort.h") if(BUILD_SHARED_LIBS) diff --git a/StormLib_vs12.vcxproj b/StormLib_vs12.vcxproj index 663554a..b11d1ee 100644 --- a/StormLib_vs12.vcxproj +++ b/StormLib_vs12.vcxproj @@ -606,13 +606,13 @@ </ItemGroup> <ItemGroup> <ClInclude Include="src\StormCommon.h" /> - <ClInclude Include="include\StormLib.h" /> - <ClInclude Include="include\StormPort.h" /> <ClInclude Include="src\adpcm\adpcm.h" /> <ClInclude Include="src\huffman\huff.h" /> <ClInclude Include="src\pklib\pklib.h" /> <ClInclude Include="src\sparse\sparse.h" /> <ClInclude Include="src\jenkins\lookup.h" /> + <ClInclude Include="src\StormLib.h" /> + <ClInclude Include="src\StormPort.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="src\FileStream.cpp"> diff --git a/StormLib_vs15.vcxproj b/StormLib_vs15.vcxproj index 59dbdb3..ea3bf82 100644 --- a/StormLib_vs15.vcxproj +++ b/StormLib_vs15.vcxproj @@ -607,13 +607,13 @@ </ItemGroup> <ItemGroup> <ClInclude Include="src\StormCommon.h" /> - <ClInclude Include="include\StormLib.h" /> - <ClInclude Include="include\StormPort.h" /> <ClInclude Include="src\adpcm\adpcm.h" /> <ClInclude Include="src\huffman\huff.h" /> <ClInclude Include="src\pklib\pklib.h" /> <ClInclude Include="src\sparse\sparse.h" /> <ClInclude Include="src\jenkins\lookup.h" /> + <ClInclude Include="src\StormLib.h" /> + <ClInclude Include="src\StormPort.h" /> </ItemGroup> <ItemGroup> <ClCompile Include="src\FileStream.cpp"> diff --git a/StormLib_vs15.vcxproj.filters b/StormLib_vs15.vcxproj.filters index a532132..37915d2 100644 --- a/StormLib_vs15.vcxproj.filters +++ b/StormLib_vs15.vcxproj.filters @@ -80,12 +80,6 @@ <ClInclude Include="src\StormCommon.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="include\StormLib.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="include\StormPort.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="src\adpcm\adpcm.h"> <Filter>Source Files\adpcm</Filter> </ClInclude> @@ -101,6 +95,12 @@ <ClInclude Include="src\jenkins\lookup.h"> <Filter>Source Files\jenkins</Filter> </ClInclude> + <ClInclude Include="src\StormLib.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="src\StormPort.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="src\FileStream.cpp"> |