get msvc using the new icon

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3862 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/darkplaces.dsp b/darkplaces.dsp
index 9add5e77e0d89cb34de82493d513c8125c49c7f8..b714c0b2f5fb1f370f0995245d4e0f2b9c4a4211 100644 (file)
--- a/darkplaces.dsp
+++ b/darkplaces.dsp
@@ -176,6 +176,10 @@ SOURCE=.\cvar.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\darkplaces.rc\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\dpvsimpledecode.c\r
 # End Source File\r
 # Begin Source File\r
@@ -714,6 +718,10 @@ SOURCE=.\zone.h
 # Begin Group "Resource Files"\r
 \r
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+# Begin Source File\r
+\r
+SOURCE=.\darkplaces.ico\r
+# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/darkplaces.rc b/darkplaces.rc
new file mode 100644 (file)
index 0000000..12241b9
--- /dev/null
+++ b/darkplaces.rc
@@ -0,0 +1,72 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON    DISCARDABLE     "darkplaces.ico"
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

diff --git a/resource.h b/resource.h
index afabb2eb23325fdff95beda62b08e749ebd51adb..27fc918d187ce150e83a3c7fd51af2ff78d40523 100644 (file)
--- a/resource.h
+++ b/resource.h
@@ -1,20 +1,16 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
-// Used by winquake.rc
+// Used by darkplaces.rc
 //
-#define IDS_STRING1                     1
-#define IDI_ICON2                       1
-#define IDD_DIALOG1                     108
-#define IDD_PROGRESS                    109
-#define IDC_PROGRESS                    1000
+#define IDI_ICON1                       101
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        111
+#define _APS_NEXT_RESOURCE_VALUE        102
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1004
+#define _APS_NEXT_CONTROL_VALUE         1000
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

diff --git a/vid_wgl.c b/vid_wgl.c
index 194c0da8f5daeeead4e864c69c61bca1c97511cb..3733ca1d3e8c30317db5293024530b716176bf48 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -711,7 +711,7 @@ void VID_Init(void)
        WNDCLASS wc;
 
        InitCommonControls();
-       hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON2));
+       hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1));
 
        // Register the frame class
        wc.style         = 0;