summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-04-24 02:25:35 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-04-24 02:25:35 +0000
commita14ac3d6c7f31a94c0fc732fb1e238b3ded332b2 (patch)
tree14ca041826eef51cb55ad70dca700e23052f8a11
parent48ef64ed6ce7436bc0361f41e3c2b02d510b51b2 (diff)
downloadpcsxr-a14ac3d6c7f31a94c0fc732fb1e238b3ded332b2.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@46407 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--ChangeLog5
-rw-r--r--win32/pcsx.rc6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a934ebb..2665ac63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+April 24, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
+
+ * win32/pcsx.rc: Don't include afxres.h, which doesn't exist in MSVC
+ 2010 Express.
+
April 18, 2010 edgbla <edgbla@yandex.ru>
* po/ru_RU.po: Updated.
diff --git a/win32/pcsx.rc b/win32/pcsx.rc
index fee775de..235522c7 100644
--- a/win32/pcsx.rc
+++ b/win32/pcsx.rc
@@ -7,7 +7,11 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include "windows.h"
+#include "winuser.h"
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS