Merge branch 'master' of /home/eressea/repo/eressea

src/eressea.vcxproj

@@ -181,7 +181,7 @@
     <ClInclude Include="spells\unitcurse.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="spells\Jamfile" />
+    <None Include="..\CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

src/eressea.vcxproj.filters

@@ -116,12 +116,12 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="spells\Jamfile" />
-  </ItemGroup>
   <ItemGroup>
     <CustomBuildStep Include="races\races.h">
       <Filter>Source Files</Filter>
     </CustomBuildStep>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\CMakeLists.txt" />
+  </ItemGroup>
 </Project>

src/spells/Jamfile

@@ -1,23 +0,0 @@
-SubDir TOP src spells ;
-
-TargetDirectory ;
-SubDirHdrs $(SUBDIR)/../gamecode ;
-SubDirHdrs $(SUBDIR)/../kernel ;
-SubDirHdrs $(SUBDIR)/../util ;
-SubDirHdrs $(SUBDIR)/.. ;
-SubDirHdrs $(SUBDIR)/../.. ;
-SubDirHdrs $(XMLHDRS) ;
-
-SOURCES =
- alp.c
- buildingcurse.c
- combatspells.c
- regioncurse.c
- shipcurse.c
- spells.c
- unitcurse.c
- ;
-
-if $(BUILDTYPE) = REGULAR {
-Library spells : $(SOURCES) ;
-}