ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/snes9xgit/snes9x 

Conflicts:
	win32/snes9xw.vcproj
	win32/wsnes9x.cpp
This commit is contained in:
gocha 2012-08-08 23:04:02 +09:00
parent c49e1529cb 7ed405d6e2
commit 719eee2cd9
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
win32/rsrc/snes9x.rc
View File

@ -7,7 +7,8 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include "windows.h"
#define IDC_STATIC (-1)
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@ -945,11 +946,6 @@ BEGIN
END
2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\0"
END
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"

4
win32/wsnes9x.h
View File

@ -198,10 +198,6 @@
#include <mmsystem.h>
#ifndef __BORLANDC__
#ifndef __MINGW32__
#include <afxres.h>
#endif
#include <dsound.h>
#endif
#include "rsrc/resource.h"