Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Enno 2011-02-24 08:27:31 +01:00
parent 4a91dcdc73 0ad43a9586
commit 44e4c44a2d
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eressea.vcxproj
View File

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

6
src/eressea.vcxproj.filters
View File

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

23
src/spells/Jamfile
View File

@ -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) ;
}