Permalink
Browse files

Fix Windows build for Visual Studio 2012

  • Loading branch information...
1 parent 38f6210 commit 1a63accc991edd18b9327242579f10e0ac25189f @cwc committed Feb 13, 2013
View
4 Omega/src/defs.h
@@ -17,6 +17,8 @@ definitions in the following section. */
#define usleep(x) sleep(1)
#define getlogin() "pcuser" // TODO Get the real user name
+#include "pdcurses.h"
+
#ifdef SAVE_LEVELS
# include <sys/timeb.h>
# include <io.h>
@@ -30,12 +32,12 @@ definitions in the following section. */
#include <errno.h>
#include <signal.h>
#include <sys/wait.h>
+#include <curses.h>
#endif
#include <sys/types.h>
#include <ctype.h>
#include <limits.h>
-#include <curses.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
View
5 Omega/src/file.c
@@ -132,9 +132,9 @@ void showmotd(void)
displayfile(Str1);
}
-
void lock_score_file(void)
{
+#ifndef WIN32
int lock;
int thispid;
int lastpid = 0;
@@ -182,13 +182,16 @@ void lock_score_file(void)
sprintf(Str1, "%d", getpid());
write(lock, Str1, strlen(Str1));
close(lock);
+#endif
}
void unlock_score_file(void)
{
+#ifndef WIN32
strcpy(Str1,Omegalib);
strcat(Str1,"omega.hi.lock");
unlink(Str1);
+#endif
}
void showscores(void)
View
7 Omega/src/mon.c
@@ -1413,10 +1413,9 @@ void strengthen_death(pmt m)
m->speed = max(m->speed-1,1);
m->movef = M_MOVE_SMART;
- /* In order not to have to make the hp's into longs or unsigned,
- which would involve lots of changes, I'll make it max out at 30000. */
- unsigned tmp = 100+m->dmg*10;
- m->hp = (tmp > 30000) ? 30000 : tmp;
+ /* In order not to have to make the hp's into longs or unsigned,
+ which would involve lots of changes, I'll make it max out at 30000. */
+ m->hp = min(30000, 100 * m->dmg * 10);
*scythe = Objects[OB_SCYTHE_DEATH];
ol->thing = scythe;
View
0 lib/curses.h → Omega/src/pdcurses.h
File renamed without changes.
View
19 build/win32/vs2012/OmegaRPG.sln
@@ -1,27 +1,24 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tools", "src\Tools\Tools.vcxproj", "{463483F6-F45A-437A-A9F1-0B0318DB515F}"
- ProjectSection(ProjectDependencies) = postProject
- {D144A6BB-1ED6-4993-9A52-8DA5C8F3AFCC} = {D144A6BB-1ED6-4993-9A52-8DA5C8F3AFCC}
- EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OmegaRPG", "OmegaRPG.vcxproj", "{D144A6BB-1ED6-4993-9A52-8DA5C8F3AFCC}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OmegaRPG", "src\OmegaRPG\OmegaRPG.vcxproj", "{D144A6BB-1ED6-4993-9A52-8DA5C8F3AFCC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tools", "Tools.vcxproj", "{463483F6-F45A-437A-A9F1-0B0318DB515F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {463483F6-F45A-437A-A9F1-0B0318DB515F}.Debug|Win32.ActiveCfg = Debug|Win32
- {463483F6-F45A-437A-A9F1-0B0318DB515F}.Debug|Win32.Build.0 = Debug|Win32
- {463483F6-F45A-437A-A9F1-0B0318DB515F}.Release|Win32.ActiveCfg = Release|Win32
- {463483F6-F45A-437A-A9F1-0B0318DB515F}.Release|Win32.Build.0 = Release|Win32
{D144A6BB-1ED6-4993-9A52-8DA5C8F3AFCC}.Debug|Win32.ActiveCfg = Debug|Win32
{D144A6BB-1ED6-4993-9A52-8DA5C8F3AFCC}.Debug|Win32.Build.0 = Debug|Win32
{D144A6BB-1ED6-4993-9A52-8DA5C8F3AFCC}.Release|Win32.ActiveCfg = Release|Win32
{D144A6BB-1ED6-4993-9A52-8DA5C8F3AFCC}.Release|Win32.Build.0 = Release|Win32
+ {463483F6-F45A-437A-A9F1-0B0318DB515F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {463483F6-F45A-437A-A9F1-0B0318DB515F}.Debug|Win32.Build.0 = Debug|Win32
+ {463483F6-F45A-437A-A9F1-0B0318DB515F}.Release|Win32.ActiveCfg = Release|Win32
+ {463483F6-F45A-437A-A9F1-0B0318DB515F}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
141 build/win32/vs2012/OmegaRPG.vcxproj
@@ -11,72 +11,74 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\defs.h" />
- <ClInclude Include="src\extern.h" />
- <ClInclude Include="src\glob.h" />
- <ClInclude Include="src\iinit.h" />
- <ClInclude Include="src\minit.h" />
- <ClInclude Include="src\oldsave.h" />
- <ClInclude Include="src\OmegaRPG.h" />
+ <ClInclude Include="..\..\..\lib\pdcurses.h" />
+ <ClInclude Include="..\..\..\Omega\src\colors.h" />
+ <ClInclude Include="..\..\..\Omega\src\defs.h" />
+ <ClInclude Include="..\..\..\Omega\src\extern.h" />
+ <ClInclude Include="..\..\..\Omega\src\glob.h" />
+ <ClInclude Include="..\..\..\Omega\src\monsters.h" />
+ <ClInclude Include="..\..\..\Omega\src\objects.h" />
+ <ClInclude Include="..\..\..\Omega\src\OmegaRPG.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\abyss.c" />
- <ClCompile Include="src\aux1.c" />
- <ClCompile Include="src\aux2.c" />
- <ClCompile Include="src\aux3.c" />
- <ClCompile Include="src\bank.c" />
- <ClCompile Include="src\char.c" />
- <ClCompile Include="src\city.c" />
- <ClCompile Include="src\command1.c" />
- <ClCompile Include="src\command2.c" />
- <ClCompile Include="src\command3.c" />
- <ClCompile Include="src\country.c" />
- <ClCompile Include="src\effect1.c" />
- <ClCompile Include="src\effect2.c" />
- <ClCompile Include="src\effect3.c" />
- <ClCompile Include="src\env.c" />
- <ClCompile Include="src\etc.c" />
- <ClCompile Include="src\file.c" />
- <ClCompile Include="src\gen1.c" />
- <ClCompile Include="src\gen2.c" />
- <ClCompile Include="src\guild1.c" />
- <ClCompile Include="src\guild2.c" />
- <ClCompile Include="src\house.c" />
- <ClCompile Include="src\init.c" />
- <ClCompile Include="src\inv.c" />
- <ClCompile Include="src\item.c" />
- <ClCompile Include="src\itemf1.c" />
- <ClCompile Include="src\itemf2.c" />
- <ClCompile Include="src\itemf3.c" />
- <ClCompile Include="src\lev.c" />
- <ClCompile Include="src\Main.cpp" />
- <ClCompile Include="src\map.c" />
- <ClCompile Include="src\mmelee.c" />
- <ClCompile Include="src\mmove.c" />
- <ClCompile Include="src\mon.c" />
- <ClCompile Include="src\move.c" />
- <ClCompile Include="src\movef.c" />
- <ClCompile Include="src\mspec.c" />
- <ClCompile Include="src\mstrike.c" />
- <ClCompile Include="src\mtalk.c" />
- <ClCompile Include="src\newrand.c" />
- <ClCompile Include="src\omega.c" />
- <ClCompile Include="src\OmegaRPG.cpp" />
- <ClCompile Include="src\pdump.c" />
- <ClCompile Include="src\priest.c" />
- <ClCompile Include="src\save.c" />
- <ClCompile Include="src\scr.c" />
- <ClCompile Include="src\site1.c" />
- <ClCompile Include="src\site2.c" />
- <ClCompile Include="src\spell.c" />
- <ClCompile Include="src\stats.c" />
- <ClCompile Include="src\time.c" />
- <ClCompile Include="src\trap.c" />
- <ClCompile Include="src\util.c" />
- <ClCompile Include="src\village.c" />
+ <ClCompile Include="..\..\..\Omega\src\abyss.c" />
+ <ClCompile Include="..\..\..\Omega\src\aux1.c" />
+ <ClCompile Include="..\..\..\Omega\src\aux2.c" />
+ <ClCompile Include="..\..\..\Omega\src\aux3.c" />
+ <ClCompile Include="..\..\..\Omega\src\bank.c" />
+ <ClCompile Include="..\..\..\Omega\src\char.c" />
+ <ClCompile Include="..\..\..\Omega\src\city.c" />
+ <ClCompile Include="..\..\..\Omega\src\colors.c" />
+ <ClCompile Include="..\..\..\Omega\src\command1.c" />
+ <ClCompile Include="..\..\..\Omega\src\command2.c" />
+ <ClCompile Include="..\..\..\Omega\src\command3.c" />
+ <ClCompile Include="..\..\..\Omega\src\country.c" />
+ <ClCompile Include="..\..\..\Omega\src\effect1.c" />
+ <ClCompile Include="..\..\..\Omega\src\effect2.c" />
+ <ClCompile Include="..\..\..\Omega\src\effect3.c" />
+ <ClCompile Include="..\..\..\Omega\src\env.c" />
+ <ClCompile Include="..\..\..\Omega\src\etc.c" />
+ <ClCompile Include="..\..\..\Omega\src\file.c" />
+ <ClCompile Include="..\..\..\Omega\src\gen1.c" />
+ <ClCompile Include="..\..\..\Omega\src\gen2.c" />
+ <ClCompile Include="..\..\..\Omega\src\guild1.c" />
+ <ClCompile Include="..\..\..\Omega\src\guild2.c" />
+ <ClCompile Include="..\..\..\Omega\src\house.c" />
+ <ClCompile Include="..\..\..\Omega\src\init.c" />
+ <ClCompile Include="..\..\..\Omega\src\inv.c" />
+ <ClCompile Include="..\..\..\Omega\src\item.c" />
+ <ClCompile Include="..\..\..\Omega\src\itemf1.c" />
+ <ClCompile Include="..\..\..\Omega\src\itemf2.c" />
+ <ClCompile Include="..\..\..\Omega\src\itemf3.c" />
+ <ClCompile Include="..\..\..\Omega\src\lev.c" />
+ <ClCompile Include="..\..\..\Omega\src\Main.cpp" />
+ <ClCompile Include="..\..\..\Omega\src\map.c" />
+ <ClCompile Include="..\..\..\Omega\src\mmelee.c" />
+ <ClCompile Include="..\..\..\Omega\src\mmove.c" />
+ <ClCompile Include="..\..\..\Omega\src\mon.c" />
+ <ClCompile Include="..\..\..\Omega\src\move.c" />
+ <ClCompile Include="..\..\..\Omega\src\movef.c" />
+ <ClCompile Include="..\..\..\Omega\src\mspec.c" />
+ <ClCompile Include="..\..\..\Omega\src\mstrike.c" />
+ <ClCompile Include="..\..\..\Omega\src\mtalk.c" />
+ <ClCompile Include="..\..\..\Omega\src\newrand.c" />
+ <ClCompile Include="..\..\..\Omega\src\omega.c" />
+ <ClCompile Include="..\..\..\Omega\src\OmegaRPG.cpp" />
+ <ClCompile Include="..\..\..\Omega\src\pdump.c" />
+ <ClCompile Include="..\..\..\Omega\src\priest.c" />
+ <ClCompile Include="..\..\..\Omega\src\save.c" />
+ <ClCompile Include="..\..\..\Omega\src\scr.c" />
+ <ClCompile Include="..\..\..\Omega\src\site1.c" />
+ <ClCompile Include="..\..\..\Omega\src\site2.c" />
+ <ClCompile Include="..\..\..\Omega\src\spell.c" />
+ <ClCompile Include="..\..\..\Omega\src\stats.c" />
+ <ClCompile Include="..\..\..\Omega\src\time.c" />
+ <ClCompile Include="..\..\..\Omega\src\trap.c" />
+ <ClCompile Include="..\..\..\Omega\src\util.c" />
+ <ClCompile Include="..\..\..\Omega\src\village.c" />
</ItemGroup>
<ItemGroup>
- <Library Include="..\..\lib\pdcurses.lib" />
+ <Library Include="..\..\..\lib\pdcurses.lib" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D144A6BB-1ED6-4993-9A52-8DA5C8F3AFCC}</ProjectGuid>
@@ -85,15 +87,15 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -105,10 +107,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
- <IntDir>$(SolutionDir)obj\$(Configuration)\</IntDir>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
</PropertyGroup>
@@ -126,8 +125,8 @@
</Link>
<PostBuildEvent>
<Command>mkdir $(TargetDir)data
-copy /y $(SolutionDir)data\*.* $(TargetDir)data
-copy /y $(SolutionDir)lib\*.dll $(TargetDir)</Command>
+copy /y $(SolutionDir)..\..\..\data\*.* $(TargetDir)data
+copy /y $(SolutionDir)..\..\..\lib\*.dll $(TargetDir)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -152,4 +151,4 @@ copy /y $(SolutionDir)lib\*.dll $(TargetDir)</Command>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
View
144 build/win32/vs2012/OmegaRPG.vcxproj.filters
@@ -20,194 +20,200 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\oldsave.h">
- <Filter>Header Files</Filter>
+ <ClInclude Include="..\..\..\Omega\src\colors.h">
+ <Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="src\minit.h">
- <Filter>Header Files</Filter>
+ <ClInclude Include="..\..\..\Omega\src\defs.h">
+ <Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="src\iinit.h">
- <Filter>Header Files</Filter>
+ <ClInclude Include="..\..\..\Omega\src\extern.h">
+ <Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="src\glob.h">
- <Filter>Header Files</Filter>
+ <ClInclude Include="..\..\..\Omega\src\glob.h">
+ <Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="src\extern.h">
- <Filter>Header Files</Filter>
+ <ClInclude Include="..\..\..\Omega\src\monsters.h">
+ <Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="src\defs.h">
- <Filter>Header Files</Filter>
+ <ClInclude Include="..\..\..\Omega\src\objects.h">
+ <Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="src\OmegaRPG.h">
- <Filter>Header Files</Filter>
+ <ClInclude Include="..\..\..\Omega\src\OmegaRPG.h">
+ <Filter>Source Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\lib\pdcurses.h">
+ <Filter>Source Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\effect2.c">
+ <ClCompile Include="..\..\..\Omega\src\abyss.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Omega\src\aux1.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\effect1.c">
+ <ClCompile Include="..\..\..\Omega\src\aux2.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\country.c">
+ <ClCompile Include="..\..\..\Omega\src\aux3.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\command3.c">
+ <ClCompile Include="..\..\..\Omega\src\bank.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\command2.c">
+ <ClCompile Include="..\..\..\Omega\src\char.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\command1.c">
+ <ClCompile Include="..\..\..\Omega\src\city.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\city.c">
+ <ClCompile Include="..\..\..\Omega\src\colors.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\char.c">
+ <ClCompile Include="..\..\..\Omega\src\command1.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\bank.c">
+ <ClCompile Include="..\..\..\Omega\src\command2.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\aux3.c">
+ <ClCompile Include="..\..\..\Omega\src\command3.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\aux2.c">
+ <ClCompile Include="..\..\..\Omega\src\country.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\aux1.c">
+ <ClCompile Include="..\..\..\Omega\src\effect1.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\abyss.c">
+ <ClCompile Include="..\..\..\Omega\src\effect2.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\village.c">
+ <ClCompile Include="..\..\..\Omega\src\effect3.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\util.c">
+ <ClCompile Include="..\..\..\Omega\src\env.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\trap.c">
+ <ClCompile Include="..\..\..\Omega\src\etc.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\time.c">
+ <ClCompile Include="..\..\..\Omega\src\file.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\stats.c">
+ <ClCompile Include="..\..\..\Omega\src\gen1.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\spell.c">
+ <ClCompile Include="..\..\..\Omega\src\gen2.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\site2.c">
+ <ClCompile Include="..\..\..\Omega\src\guild1.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\site1.c">
+ <ClCompile Include="..\..\..\Omega\src\guild2.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\scr.c">
+ <ClCompile Include="..\..\..\Omega\src\house.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\save.c">
+ <ClCompile Include="..\..\..\Omega\src\init.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\priest.c">
+ <ClCompile Include="..\..\..\Omega\src\inv.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\pdump.c">
+ <ClCompile Include="..\..\..\Omega\src\item.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\omega.c">
+ <ClCompile Include="..\..\..\Omega\src\itemf1.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\newrand.c">
+ <ClCompile Include="..\..\..\Omega\src\itemf2.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\mtalk.c">
+ <ClCompile Include="..\..\..\Omega\src\itemf3.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\mstrike.c">
+ <ClCompile Include="..\..\..\Omega\src\lev.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\mspec.c">
+ <ClCompile Include="..\..\..\Omega\src\Main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\movef.c">
+ <ClCompile Include="..\..\..\Omega\src\map.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\move.c">
+ <ClCompile Include="..\..\..\Omega\src\mmelee.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\mon.c">
+ <ClCompile Include="..\..\..\Omega\src\mmove.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\mmove.c">
+ <ClCompile Include="..\..\..\Omega\src\mon.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\mmelee.c">
+ <ClCompile Include="..\..\..\Omega\src\move.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\map.c">
+ <ClCompile Include="..\..\..\Omega\src\movef.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\lev.c">
+ <ClCompile Include="..\..\..\Omega\src\mspec.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\itemf3.c">
+ <ClCompile Include="..\..\..\Omega\src\mstrike.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\itemf2.c">
+ <ClCompile Include="..\..\..\Omega\src\mtalk.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\itemf1.c">
+ <ClCompile Include="..\..\..\Omega\src\newrand.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\item.c">
+ <ClCompile Include="..\..\..\Omega\src\omega.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\inv.c">
+ <ClCompile Include="..\..\..\Omega\src\OmegaRPG.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\init.c">
+ <ClCompile Include="..\..\..\Omega\src\pdump.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\house.c">
+ <ClCompile Include="..\..\..\Omega\src\priest.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\guild2.c">
+ <ClCompile Include="..\..\..\Omega\src\save.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\guild1.c">
+ <ClCompile Include="..\..\..\Omega\src\scr.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\gen2.c">
+ <ClCompile Include="..\..\..\Omega\src\site1.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\gen1.c">
+ <ClCompile Include="..\..\..\Omega\src\site2.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\file.c">
+ <ClCompile Include="..\..\..\Omega\src\spell.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\etc.c">
+ <ClCompile Include="..\..\..\Omega\src\stats.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\env.c">
+ <ClCompile Include="..\..\..\Omega\src\time.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\effect3.c">
+ <ClCompile Include="..\..\..\Omega\src\trap.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\OmegaRPG.cpp">
+ <ClCompile Include="..\..\..\Omega\src\util.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\Main.cpp">
+ <ClCompile Include="..\..\..\Omega\src\village.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <Library Include="..\..\lib\pdcurses.lib">
+ <Library Include="..\..\..\lib\pdcurses.lib">
<Filter>Third-Party Libraries</Filter>
</Library>
</ItemGroup>
View
28 build/win32/vs2012/Tools.vcxproj
@@ -10,6 +10,19 @@
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\Tools\src\bwt.c" />
+ <ClCompile Include="..\..\..\Tools\src\crypt.c" />
+ <ClCompile Include="..\..\..\Tools\src\decrypt.c" />
+ <ClCompile Include="..\..\..\Tools\src\genclr.c" />
+ <ClCompile Include="..\..\..\Tools\src\OmegaTool.cpp" />
+ <ClCompile Include="..\..\..\Tools\src\PackTool.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\Tools\src\bwt.h" />
+ <ClInclude Include="..\..\..\Tools\src\OmegaTool.h" />
+ <ClInclude Include="..\..\..\Tools\src\PackTool.h" />
+ </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{463483F6-F45A-437A-A9F1-0B0318DB515F}</ProjectGuid>
<RootNamespace>Tools</RootNamespace>
@@ -19,12 +32,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -72,19 +87,6 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="src\bwt.c" />
- <ClCompile Include="src\crypt.c" />
- <ClCompile Include="src\decrypt.c" />
- <ClCompile Include="src\genclr.c" />
- <ClCompile Include="src\OmegaTool.cpp" />
- <ClCompile Include="src\PackTool.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="src\bwt.h" />
- <ClInclude Include="src\OmegaTool.h" />
- <ClInclude Include="src\PackTool.h" />
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
View
24 build/win32/vs2012/Tools.vcxproj.filters
@@ -15,34 +15,34 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\bwt.c">
+ <ClCompile Include="..\..\..\Tools\src\bwt.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\crypt.c">
+ <ClCompile Include="..\..\..\Tools\src\crypt.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\decrypt.c">
+ <ClCompile Include="..\..\..\Tools\src\decrypt.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\genclr.c">
+ <ClCompile Include="..\..\..\Tools\src\genclr.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\OmegaTool.cpp">
+ <ClCompile Include="..\..\..\Tools\src\OmegaTool.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\PackTool.cpp">
+ <ClCompile Include="..\..\..\Tools\src\PackTool.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\bwt.h">
- <Filter>Header Files</Filter>
+ <ClInclude Include="..\..\..\Tools\src\bwt.h">
+ <Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="src\OmegaTool.h">
- <Filter>Header Files</Filter>
+ <ClInclude Include="..\..\..\Tools\src\OmegaTool.h">
+ <Filter>Source Files</Filter>
</ClInclude>
- <ClInclude Include="src\PackTool.h">
- <Filter>Header Files</Filter>
+ <ClInclude Include="..\..\..\Tools\src\PackTool.h">
+ <Filter>Source Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

0 comments on commit 1a63acc

Please sign in to comment.