ref: 26658f1045a1e336a10039c0869eda27b34c6eb1
parent: 28201684a5e78fbc2aa9cff1eb1a9180b4d58c7a
author: unknown <fabien@fabien-PC.(none)>
date: Sat Dec 22 18:08:08 EST 2012
Fixed VisualStudio build.
--- a/Engine/Engine.vcxproj
+++ b/Engine/Engine.vcxproj
@@ -100,9 +100,9 @@
<ClCompile Include="src\draw.c" />
<ClCompile Include="src\Engine.c" />
<ClCompile Include="src\filesystem.c" />
+ <ClCompile Include="src\fixedPoint_math.c" />
<ClCompile Include="src\mmulti.c" />
<ClCompile Include="src\mmulti_stable.cpp" />
- <ClCompile Include="src\pragmas.c" />
<ClCompile Include="src\enet\host.c" />
<ClCompile Include="src\enet\list.c" />
<ClCompile Include="src\enet\memory.c" />
@@ -111,6 +111,8 @@
<ClCompile Include="src\enet\protocol.c" />
<ClCompile Include="src\enet\unix.c" />
<ClCompile Include="src\enet\win32.c" />
+ <ClCompile Include="src\network.c" />
+ <ClCompile Include="src\tiles.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\build.h" />
@@ -119,9 +121,11 @@
<ClInclude Include="src\draw.h" />
<ClInclude Include="src\Engine.h" />
<ClInclude Include="src\filesystem.h" />
+ <ClInclude Include="src\fixedPoint_math.h" />
<ClInclude Include="src\icon.h" />
+ <ClInclude Include="src\network.h" />
<ClInclude Include="src\platform.h" />
- <ClInclude Include="src\pragmas.h" />
+ <ClInclude Include="src\tiles.h" />
<ClInclude Include="src\win32_compat.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--- a/Engine/Engine.vcxproj.filters
+++ b/Engine/Engine.vcxproj.filters
@@ -23,9 +23,6 @@
<ClCompile Include="src\mmulti_stable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\pragmas.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="src\enet\host.c">
<Filter>enet</Filter>
</ClCompile>
@@ -62,6 +59,15 @@
<ClCompile Include="src\filesystem.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\network.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\tiles.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="src\fixedPoint_math.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\build.h">
@@ -79,9 +85,6 @@
<ClInclude Include="src\platform.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="src\pragmas.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\win32_compat.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -92,6 +95,15 @@
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\filesystem.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\network.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\tiles.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\fixedPoint_math.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
--- a/Engine/src/display.c
+++ b/Engine/src/display.c
@@ -1246,8 +1246,8 @@
uint8_t* transPointer = transluc;
uint8_t* bufferPointer = buffer;
int i;
+ FILE* file;
-
for (i=0; i < 65535; i++) {bufferPointer[0] = (lastPalette[(*transPointer)*3+0]) / 63.0 * 255;
@@ -1265,7 +1265,7 @@
- FILE* file = fopen("transluc.tga", "w");+ file = fopen("transluc.tga", "w");memset(tga_header, 0, 18);
tga_header[2] = 2;
--- a/Engine/src/mmulti.c
+++ b/Engine/src/mmulti.c
@@ -26,7 +26,7 @@
#include "platform.h"
-#include "pragmas.h"
+#include "fixedPoint_math.h"
#define MAXPLAYERS 16
#define BAKSIZ 16384
--- a/Engine/src/mmulti_stable.cpp
+++ b/Engine/src/mmulti_stable.cpp
@@ -16,7 +16,7 @@
{#include "platform.h"
-#include "pragmas.h"
+#include "fixedPoint_math.h"
#include "signal.h"
#include "mmulti_stable.h"
#include "filesystem.h"