+ Removed DEFINE from CMakeLists.txt

+ Fixed paths to include files

Author: Zezula Ladislav

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)

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">

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">

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">