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

-Fixed an issue where winsock.h and winsock2.h were both being included in Visual C++ 

-Fixed a variable declaration issue.
This commit is contained in:
cyberwarriorx 2007-01-14 21:33:01 +00:00
parent 37485aaaa8
commit ce213dde54
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desmume/src/windows/CWindow.h
View File

@ -22,6 +22,7 @@
#ifndef CWINDOW_H #ifndef CWINDOW_H
#define CWINDOW_H #define CWINDOW_H
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include "../types.h" #include "../types.h"

1
desmume/src/windows/disView.c
View File

@ -19,7 +19,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <windows.h>
#include <tchar.h> #include <tchar.h>
#include <stdio.h> #include <stdio.h>
#include "../MMU.h" #include "../MMU.h"

1
desmume/src/windows/ginfo.c
View File

@ -19,7 +19,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <windows.h>
#include "resource.h" #include "resource.h"
#include "../NDSSystem.h" #include "../NDSSystem.h"
#include "../MMU.h" #include "../MMU.h"

7
desmume/src/windows/main.c
View File

@ -23,9 +23,12 @@
//#define RENDER3D //#define RENDER3D
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <shellapi.h>
#include <Winuser.h> #include <Winuser.h>
#include <commctrl.h> #include <commctrl.h>
#include <commdlg.h>
#include <stdio.h> #include <stdio.h>
#include "CWindow.h" #include "CWindow.h"
#include "../MMU.h" #include "../MMU.h"
@ -286,9 +289,9 @@ DWORD WINAPI run( LPVOID lpParameter)
StretchDIBits (hdc, 0, 0, r.right-r.left, r.bottom-r.top, 0, 0, 256, 192*2, GPU_screen, (BITMAPINFO*)&bmi, DIB_RGB_COLORS,SRCCOPY); StretchDIBits (hdc, 0, 0, r.right-r.left, r.bottom-r.top, 0, 0, 256, 192*2, GPU_screen, (BITMAPINFO*)&bmi, DIB_RGB_COLORS,SRCCOPY);
} else } else
{ {
RECT r ;
GPU_rotate(&rotationbmi); GPU_rotate(&rotationbmi);
RECT r ; GetClientRect(hwnd,&r) ;
GetClientRect(hwnd,&r) ;
StretchDIBits(hdc, 0, 0, r.right-r.left, r.bottom-r.top, 0, 0, GPU_width, rotationscanlines, GPU_screenrotated, (BITMAPINFO*)&rotationbmi, DIB_RGB_COLORS,SRCCOPY); StretchDIBits(hdc, 0, 0, r.right-r.left, r.bottom-r.top, 0, 0, GPU_width, rotationscanlines, GPU_screenrotated, (BITMAPINFO*)&rotationbmi, DIB_RGB_COLORS,SRCCOPY);
} }
fpsframecount++; fpsframecount++;

1
desmume/src/windows/mapView.h
View File

@ -22,7 +22,6 @@
#ifndef MAPVIEW_H #ifndef MAPVIEW_H
#define MAPVIEW_H #define MAPVIEW_H
#include <windows.h>
#include "CWindow.h" #include "CWindow.h"
typedef struct typedef struct

1
desmume/src/windows/resources.rc
View File

@ -19,6 +19,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include "resource.h" #include "resource.h"