diff --git a/src/Makefile.mingw b/src/Makefile.mingw index fc6c5a1c0..78e84209c 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -2,8 +2,9 @@ VPATH = . dosbox lzf resid-fp slirp CPP = g++.exe CC = gcc.exe WINDRES = windres.exe -CFLAGS = -O3 -march=native -mtune=native -fbranch-probabilities -fvpt -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse -mstackrealign -DFLAGS = -O3 -march=i686 -fomit-frame-pointer -msse2 -mstackrealign +CFLAGS = -O3 -march=native -mtune=native -fbranch-probabilities -fvpt -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse -mstackrealign -DRELEASE_BUILD +DFLAGS = -O3 -march=i686 -fomit-frame-pointer -msse2 -mstackrealign -DRELEASE_BUILD +RFLAGS = -DRELEASE_BUILD OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o acerm3a.o ali1429.o amstrad.o buslogic.o cdrom.o cdrom-ioctl.o cdrom-iso.o \ cdrom-null.o codegen.o codegen_ops.o codegen_timing_486.o codegen_timing_686.o codegen_timing_pentium.o codegen_timing_winchip.o codegen_x86.o compaq.o config.o cpu.o dac.o \ device.o disc.o disc_86f.o disc_fdi.o disc_imd.o disc_img.o disc_random.o disc_td0.o dma.o fdc.o fdc37c665.o fdc37c932fr.o fdd.o fdi2raw.o gameport.o headland.o i430hx.o i430lx.o i430fx.o \ diff --git a/src/Makefile.mingw64 b/src/Makefile.mingw64 index 9c72c48c9..50fed4459 100644 --- a/src/Makefile.mingw64 +++ b/src/Makefile.mingw64 @@ -2,8 +2,9 @@ VPATH = . dosbox lzf resid-fp slirp CPP = g++.exe CC = gcc.exe WINDRES = windres.exe -CFLAGS = -O3 -march=native -mtune=native -fbranch-probabilities -fvpt -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse -mstackrealign -DFLAGS = -O3 -fomit-frame-pointer -msse2 -mstackrealign +CFLAGS = -O3 -march=native -mtune=native -fbranch-probabilities -fvpt -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse -mstackrealign -DRELEASE_BUILD +DFLAGS = -O3 -fomit-frame-pointer -msse2 -mstackrealign -DRELEASE_BUILD +RFLAGS = -DRELEASE_BUILD OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o acerm3a.o ali1429.o amstrad.o buslogic.o cdrom.o cdrom-ioctl.o cdrom-iso.o \ cdrom-null.o codegen.o codegen_ops.o codegen_timing_486.o codegen_timing_686.o codegen_timing_pentium.o codegen_timing_winchip.o codegen_x86-64.o compaq.o config.o cpu.o dac.o \ device.o disc.o disc_86f.o disc_fdi.o disc_imd.o disc_img.o disc_random.o disc_td0.o dma.o fdc.o fdc37c665.o fdc37c932fr.o fdd.o fdi2raw.o gameport.o headland.o i430hx.o i430lx.o i430fx.o \ diff --git a/src/win-ddraw-fs.cc b/src/win-ddraw-fs.cc index 5920eb6fb..b64447b51 100644 --- a/src/win-ddraw-fs.cc +++ b/src/win-ddraw-fs.cc @@ -24,10 +24,10 @@ static void ddraw_fs_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h static void ddraw_fs_blit_memtoscreen_8(int x, int y, int w, int h); static LPDIRECTDRAW lpdd = NULL; -static LPDIRECTDRAW4 lpdd4 = NULL; -static LPDIRECTDRAWSURFACE4 lpdds_pri = NULL; -static LPDIRECTDRAWSURFACE4 lpdds_back = NULL; -static LPDIRECTDRAWSURFACE4 lpdds_back2 = NULL; +static LPDIRECTDRAW7 lpdd7 = NULL; +static LPDIRECTDRAWSURFACE7 lpdds_pri = NULL; +static LPDIRECTDRAWSURFACE7 lpdds_back = NULL; +static LPDIRECTDRAWSURFACE7 lpdds_back2 = NULL; static LPDIRECTDRAWCLIPPER lpdd_clipper = NULL; static DDSURFACEDESC2 ddsd; @@ -46,7 +46,7 @@ int ddraw_fs_init(HWND h) if (FAILED(DirectDrawCreate(NULL, &lpdd, NULL))) return 0; - if (FAILED(lpdd->QueryInterface(IID_IDirectDraw4, (LPVOID *)&lpdd4))) + if (FAILED(lpdd->QueryInterface(IID_IDirectDraw7, (LPVOID *)&lpdd7))) return 0; lpdd->Release(); @@ -54,11 +54,11 @@ int ddraw_fs_init(HWND h) atexit(ddraw_fs_close); - if (FAILED(lpdd4->SetCooperativeLevel(h, DDSCL_SETFOCUSWINDOW | + if (FAILED(lpdd7->SetCooperativeLevel(h, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_ALLOWREBOOT))) return 0; - if (FAILED(lpdd4->SetDisplayMode(ddraw_w, ddraw_h, 32, 0 ,0))) + if (FAILED(lpdd7->SetDisplayMode(ddraw_w, ddraw_h, 32, 0 ,0))) return 0; // memset(&ddsd, 0, sizeof(ddsd)); @@ -67,7 +67,7 @@ int ddraw_fs_init(HWND h) ddsd.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; ddsd.dwBackBufferCount = 1; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - if (FAILED(lpdd4->CreateSurface(&ddsd, &lpdds_pri, NULL))) + if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_pri, NULL))) return 0; ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; @@ -81,7 +81,7 @@ int ddraw_fs_init(HWND h) ddsd.dwWidth = 2048; ddsd.dwHeight = 2048; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; - if (FAILED(lpdd4->CreateSurface(&ddsd, &lpdds_back, NULL))) + if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back, NULL))) return 0; pclog("DDRAW_INIT complete\n"); @@ -114,10 +114,10 @@ void ddraw_fs_close() lpdd_clipper->Release(); lpdd_clipper = NULL; } - if (lpdd4) + if (lpdd7) { - lpdd4->Release(); - lpdd4 = NULL; + lpdd7->Release(); + lpdd7 = NULL; } } diff --git a/src/win-ddraw-screenshot.cc b/src/win-ddraw-screenshot.cc index 1942c30cb..353b00705 100644 --- a/src/win-ddraw-screenshot.cc +++ b/src/win-ddraw-screenshot.cc @@ -21,7 +21,7 @@ HBITMAP hbitmap; int xs, ys, ys2; -void CopySurface(IDirectDrawSurface4 *pDDSurface) +void CopySurface(IDirectDrawSurface7 *pDDSurface) { HDC hdc, hmemdc; @@ -151,7 +151,7 @@ void SaveBitmap(char *szFilename,HBITMAP hBitmap) if(fp) fclose(fp); } -void ddraw_common_take_screenshot(char *fn, IDirectDrawSurface4 *pDDSurface) +void ddraw_common_take_screenshot(char *fn, IDirectDrawSurface7 *pDDSurface) { xs = xsize; ys = ys2 = ysize; diff --git a/src/win-ddraw-screenshot.h b/src/win-ddraw-screenshot.h index 0d5b7cc7b..7c56e5f96 100644 --- a/src/win-ddraw-screenshot.h +++ b/src/win-ddraw-screenshot.h @@ -1,4 +1,4 @@ /* Copyright holders: Tenshi see COPYING for more details */ -void ddraw_common_take_screenshot(char *fn, IDirectDrawSurface4 *pDDSurface); +void ddraw_common_take_screenshot(char *fn, IDirectDrawSurface7 *pDDSurface); diff --git a/src/win-ddraw.cc b/src/win-ddraw.cc index 3f9e4f7e2..6b7ca19e9 100644 --- a/src/win-ddraw.cc +++ b/src/win-ddraw.cc @@ -25,10 +25,10 @@ static void ddraw_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h); static void ddraw_blit_memtoscreen_8(int x, int y, int w, int h); static LPDIRECTDRAW lpdd = NULL; -static LPDIRECTDRAW4 lpdd4 = NULL; -static LPDIRECTDRAWSURFACE4 lpdds_pri = NULL; -static LPDIRECTDRAWSURFACE4 lpdds_back = NULL; -static LPDIRECTDRAWSURFACE4 lpdds_back2 = NULL; +static LPDIRECTDRAW7 lpdd7 = NULL; +static LPDIRECTDRAWSURFACE7 lpdds_pri = NULL; +static LPDIRECTDRAWSURFACE7 lpdds_back = NULL; +static LPDIRECTDRAWSURFACE7 lpdds_back2 = NULL; static LPDIRECTDRAWCLIPPER lpdd_clipper = NULL; static DDSURFACEDESC2 ddsd; @@ -43,7 +43,7 @@ int ddraw_init(HWND h) if (FAILED(DirectDrawCreate(NULL, &lpdd, NULL))) return 0; - if (FAILED(lpdd->QueryInterface(IID_IDirectDraw4, (LPVOID *)&lpdd4))) + if (FAILED(lpdd->QueryInterface(IID_IDirectDraw7, (LPVOID *)&lpdd7))) return 0; lpdd->Release(); @@ -51,7 +51,7 @@ int ddraw_init(HWND h) atexit(ddraw_close); - if (FAILED(lpdd4->SetCooperativeLevel(h, DDSCL_NORMAL))) + if (FAILED(lpdd7->SetCooperativeLevel(h, DDSCL_NORMAL))) return 0; memset(&ddsd, 0, sizeof(ddsd)); @@ -59,7 +59,7 @@ int ddraw_init(HWND h) ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - if (FAILED(lpdd4->CreateSurface(&ddsd, &lpdds_pri, NULL))) + if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_pri, NULL))) return 0; // memset(&ddsd, 0, sizeof(ddsd)); @@ -69,7 +69,7 @@ int ddraw_init(HWND h) ddsd.dwWidth = 2048; ddsd.dwHeight = 2048; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; - if (FAILED(lpdd4->CreateSurface(&ddsd, &lpdds_back, NULL))) + if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back, NULL))) return 0; memset(&ddsd, 0, sizeof(ddsd)); @@ -79,10 +79,10 @@ int ddraw_init(HWND h) ddsd.dwWidth = 2048; ddsd.dwHeight = 2048; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY; - if (FAILED(lpdd4->CreateSurface(&ddsd, &lpdds_back2, NULL))) + if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back2, NULL))) return 0; - if (FAILED(lpdd4->CreateClipper(0, &lpdd_clipper, NULL))) + if (FAILED(lpdd7->CreateClipper(0, &lpdd_clipper, NULL))) return 0; if (FAILED(lpdd_clipper->SetHWnd(0, h))) return 0; @@ -119,10 +119,10 @@ void ddraw_close() lpdd_clipper->Release(); lpdd_clipper = NULL; } - if (lpdd4) + if (lpdd7) { - lpdd4->Release(); - lpdd4 = NULL; + lpdd7->Release(); + lpdd7 = NULL; } }