Added Nucleus icon

.gitignore

@@ -21,6 +21,7 @@
 *.app
 
 # Visual Studio files
+*.aps
 *.ilk
 *.lastcodeanalysissucceeded
 *.opensdf
@@ -29,6 +30,9 @@
 *.suo
 *.user
 
+# Adobe Illustrator files
+*.eps
+
 # Apitrace
 *.trace
 

nucleus/nucleus.vcxproj

@@ -163,6 +163,7 @@
     <ClInclude Include="logging.h" />
     <ClInclude Include="memory\memory.h" />
     <ClInclude Include="memory\segment.h" />
+    <ClInclude Include="resource.h" />
     <ClInclude Include="syscalls\callback.h" />
     <ClInclude Include="syscalls\lv1\lv1_gpu.h" />
     <ClInclude Include="syscalls\lv2.h" />
@@ -191,6 +192,9 @@
     <ClInclude Include="ui\windows\window_opengl.h" />
     <ClInclude Include="ui\windows\window.h" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="nucleus.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

nucleus/nucleus.vcxproj.filters

@@ -319,6 +319,7 @@
     <ClInclude Include="gpu\rsx_texture.h">
       <Filter>gpu</Filter>
     </ClInclude>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="memory">
@@ -382,4 +383,7 @@
       <UniqueIdentifier>{185aee07-6b27-484a-a8a4-d09127a36a70}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="nucleus.rc" />
+  </ItemGroup>
 </Project>

nucleus/ui/windows/window.cpp

@@ -4,6 +4,7 @@
  */
 
 #include "window.h"
+#include "nucleus/resource.h"
 
 LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
@@ -33,12 +34,12 @@ Window::Window(const std::string& title, int width, int height) : m_title(title)
     wc.cbClsExtra    = 0;
     wc.cbWndExtra    = 0;
     wc.hInstance     = hInstance;
-    wc.hIcon         = LoadIcon(NULL, IDI_APPLICATION);
+    wc.hIcon         = LoadIcon(hInstance, (LPCTSTR)IDI_NUCLEUS);
     wc.hCursor       = LoadCursor(NULL, IDC_ARROW);
     wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
     wc.lpszMenuName  = NULL;
     wc.lpszClassName = lpszClassName;
-    wc.hIconSm       = LoadIcon(NULL, IDI_APPLICATION);
+    wc.hIconSm       = LoadIcon(hInstance, (LPCTSTR)IDI_NUCLEUS);
 
     if (!RegisterClassEx(&wc)) {
         MessageBox(NULL, "Window Registration Failed!", "Nucleus", MB_ICONEXCLAMATION | MB_OK);