Changeset baaf6c8 in network-game

Timestamp:

Dec 24, 2012, 10:31:20 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

edfd1d0

Parents:

3f5616f

Message:

Added Compiler.h to all gui files, added the font file to the project, and moved the Window class into the gui folder

Location:

client/Client

Files:

• Client.vcxproj (modified) (1 diff)
• Client.vcxproj.filters (modified) (3 diffs)
• GuiComponent.h (modified) (1 diff)

client/Client/Client.vcxproj

@@ -82 +82 @@
     <ClInclude Include="Window.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\pirulen.ttf" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

client/Client/Client.vcxproj.filters

@@ -43 +43 @@
       <Filter>Source Files\gui</Filter>
     </ClCompile>
-    <ClCompile Include="Window.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\common\Message.cpp">
       <Filter>Source Files\common</Filter>
+    </ClCompile>
+    <ClCompile Include="Window.cpp">
+      <Filter>Source Files\gui</Filter>
     </ClCompile>
   </ItemGroup>
@@ -63 +63 @@
       <Filter>Header Files\gui</Filter>
     </ClInclude>
-    <ClInclude Include="Window.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\Compiler.h">
       <Filter>Header Files\common</Filter>
@@ -75 +72 @@
       <Filter>Header Files\common</Filter>
     </ClInclude>
+    <ClInclude Include="Window.h">
+      <Filter>Header Files\gui</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\pirulen.ttf">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
 </Project>

client/Client/GuiComponent.h

@@ -5 +5 @@
 #include <allegro5/allegro_primitives.h>
 #include <allegro5/allegro_font.h>
+
+#include "../../common/Compiler.h"
 
 class GuiComponent