win32 stuff, SIMPLE_WRITE_SOUND

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@341 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 93d6876..71add13 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -255,6 +255,11 @@ static int CheckIdle(void)
 // to be called on 224 or line_sample scanlines only\r
 static __inline void getSamples(int y)\r
 {\r
+#if SIMPLE_WRITE_SOUND\r
+  PsndRender(0, PsndLen);\r
+  if (PicoWriteSound) PicoWriteSound(PsndLen);\r
+  PsndClear();\r
+#else\r
   static int curr_pos = 0;\r
 \r
   if(y == 224) {\r
@@ -271,6 +276,7 @@ static __inline void getSamples(int y)
     emustatus&=~1;\r
     curr_pos = PsndRender(0, PsndLen/2);\r
   }\r
+#endif\r
 }\r
 \r
 \r

diff --git a/Pico/sound/sound.c b/Pico/sound/sound.c
index fbb81c8..64e172a 100644 (file)
--- a/Pico/sound/sound.c
+++ b/Pico/sound/sound.c
@@ -232,6 +232,7 @@ PICO_INTERNAL int PsndRender(int offset, int length)
   int do_pcm = (PicoMCD&1) && (PicoOpt&0x400) && (Pico_mcd->pcm.control & 0x80) && Pico_mcd->pcm.enabled;\r
   offset <<= stereo;\r
 \r
+#if !SIMPLE_WRITE_SOUND\r
   if (offset == 0) { // should happen once per frame\r
     // compensate for float part of PsndLen\r
     PsndLen_exc_cnt += PsndLen_exc_add;\r
@@ -240,6 +241,7 @@ PICO_INTERNAL int PsndRender(int offset, int length)
       length++;\r
     }\r
   }\r
+#endif\r
 \r
   // PSG\r
   if (PicoOpt & 2)\r

diff --git a/platform/gizmondo/port_config.h b/platform/gizmondo/port_config.h
index 13e4640..6a6f816 100644 (file)
--- a/platform/gizmondo/port_config.h
+++ b/platform/gizmondo/port_config.h
@@ -6,6 +6,7 @@
 #define CASE_SENSITIVE_FS 0\r
 #define DONT_OPEN_MANY_FILES 0\r
 #define REDUCE_IO_CALLS 0\r
+#define SIMPLE_WRITE_SOUND 0\r
 \r
 // draw.c\r
 #define OVERRIDE_HIGHCOL 1\r

diff --git a/platform/gp2x/port_config.h b/platform/gp2x/port_config.h
index 1503593..fe0fcea 100644 (file)
--- a/platform/gp2x/port_config.h
+++ b/platform/gp2x/port_config.h
@@ -6,6 +6,7 @@
 #define CASE_SENSITIVE_FS 1 // CS filesystem\r
 #define DONT_OPEN_MANY_FILES 0\r
 #define REDUCE_IO_CALLS 0\r
+#define SIMPLE_WRITE_SOUND 0\r
 \r
 // draw.c\r
 #define OVERRIDE_HIGHCOL 0\r

diff --git a/platform/linux/port_config.h b/platform/linux/port_config.h
index 0d9a526..21e5b32 100644 (file)
--- a/platform/linux/port_config.h
+++ b/platform/linux/port_config.h
@@ -12,9 +12,10 @@
 // pico.c
 #define CAN_HANDLE_240_LINES   1
 
+#define SIMPLE_WRITE_SOUND     0
 #define mix_32_to_16l_stereo_lvl mix_32_to_16l_stereo
 
-#define EL_LOGMASK (EL_ANOMALY|EL_STATUS|EL_SRAMIO|EL_EEPROM|EL_UIO|EL_SVP)
+#define EL_LOGMASK (EL_ANOMALY|EL_STATUS|EL_SRAMIO|EL_EEPROM|EL_UIO)//|EL_VDPDMA|EL_HVCNT|EL_ASVDP)//|EL_SVP)
 // EL_VDPDMA|EL_ASVDP|EL_SR) // |EL_BUSREQ|EL_Z80BNK)
 
 //#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)

diff --git a/platform/psp/port_config.h b/platform/psp/port_config.h
index 93cffa7..3bd139d 100644 (file)
--- a/platform/psp/port_config.h
+++ b/platform/psp/port_config.h
@@ -6,6 +6,7 @@
 #define CASE_SENSITIVE_FS 0\r
 #define DONT_OPEN_MANY_FILES 1 // work around the stupid PSP ~10 open file limit\r
 #define REDUCE_IO_CALLS 1      // another workaround\r
+#define SIMPLE_WRITE_SOUND 0\r
 \r
 // draw.c\r
 #define USE_BGR555 1\r

diff --git a/platform/win32/GenaDrive/DSound.cpp b/platform/win32/GenaDrive/DSound.cpp
index 5c9cc0c..05e7f02 100644 (file)
--- a/platform/win32/GenaDrive/DSound.cpp
+++ b/platform/win32/GenaDrive/DSound.cpp
@@ -45,7 +45,7 @@ int DSoundInit()
   wfx.nAvgBytesPerSec=wfx.nBlockAlign*wfx.nSamplesPerSec;\r
 \r
   // Make buffer for the next seg to put into the loop:\r
-  DSoundNext=(short *)malloc(PsndLen<<2); if (DSoundNext==NULL) return 1;\r
+  DSoundNext=(short *)malloc((PsndLen<<2)+64); if (DSoundNext==NULL) return 1;\r
   memset(DSoundNext,0,PsndLen<<2);\r
 \r
   // Create the DirectSound interface:\r
@@ -89,7 +89,10 @@ static int WriteSeg()
   // Lock the segment at 'LoopWrite' and copy the next segment in\r
   LoopBuffer->Lock(LoopWrite<<((PicoOpt&8) ? 2 : 1),PsndLen<<((PicoOpt&8) ? 2 : 1), &mema,&sizea, &memb,&sizeb, 0);\r
   \r
+  //dprintf2("lock %p, cpy %x\n", mema, sizea);\r
+\r
   if (mema) memcpy(mema,DSoundNext,sizea);\r
+//  if (memb) memcpy(memb,DSoundNext+sizea,sizeb);\r
 \r
   LoopBuffer->Unlock(mema,sizea, memb,0);\r
 \r
@@ -106,6 +109,8 @@ int DSoundUpdate()
   LoopBuffer->GetCurrentPosition(&play,NULL);\r
   pos=play>>((PicoOpt&8) ? 2 : 1);\r
 \r
+  //dprintf2("loop %i pos %i\n", LoopWrite, pos);\r
+\r
   // 'LoopWrite' is the next seg in the loop that we want to write\r
   // First check that the sound 'play' pointer has moved out of it:\r
   if (pos>=LoopWrite && pos<LoopWrite+PsndLen) return 1; // No, it hasn't\r

diff --git a/platform/win32/GenaDrive/Direct.cpp b/platform/win32/GenaDrive/Direct.cpp
index 320c278..07e8747 100644 (file)
--- a/platform/win32/GenaDrive/Direct.cpp
+++ b/platform/win32/GenaDrive/Direct.cpp
@@ -1,4 +1,3 @@
-\r
 #include "app.h"\r
 \r
 // d3d\r
@@ -21,91 +20,141 @@ static CustomVertex VertexList[4];
 // ddraw\r
 #include <ddraw.h>\r
 \r
-LPDIRECTDRAW7        m_pDD;\r
-LPDIRECTDRAWSURFACE7 m_pddsFrontBuffer;\r
-LPDIRECTDRAWSURFACE7 m_pddsBackBuffer;\r
+LPDIRECTDRAW7        m_pDD = NULL;\r
+LPDIRECTDRAWSURFACE7 m_pddsFrontBuffer = NULL;\r
+LPDIRECTDRAWSURFACE7 m_pddsBackBuffer = NULL;\r
 \r
 // quick and dirty stuff..\r
+static void DirectExitDDraw()\r
+{\r
+  RELEASE(m_pddsBackBuffer);\r
+  RELEASE(m_pddsFrontBuffer);\r
+  RELEASE(m_pDD);\r
+}\r
+\r
 static int DirectDrawInit()\r
 {\r
   HRESULT ret;\r
+  LPDIRECTDRAWCLIPPER pcClipper = NULL;\r
+  DDSURFACEDESC2 ddsd;\r
 \r
   ret = DirectDrawCreateEx(NULL, (VOID**)&m_pDD, IID_IDirectDraw7, NULL);\r
   if (ret) { LOGFAIL(); return 1; }\r
 \r
   // Set cooperative level\r
   ret = m_pDD->SetCooperativeLevel( FrameWnd, DDSCL_NORMAL );\r
-  if (ret) { LOGFAIL(); return 1; }\r
+  if (ret) { LOGFAIL(); goto fail; }\r
 \r
   // Create the primary surface\r
-  DDSURFACEDESC2 ddsd;\r
   ZeroMemory( &ddsd, sizeof( ddsd ) );\r
   ddsd.dwSize         = sizeof( ddsd );\r
   ddsd.dwFlags        = DDSD_CAPS;\r
   ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;\r
 \r
   ret = m_pDD->CreateSurface( &ddsd, &m_pddsFrontBuffer, NULL );\r
-  if (ret) { LOGFAIL(); return 1; }\r
+  if (ret) { LOGFAIL(); goto fail; }\r
 \r
   // Create the backbuffer surface\r
-  ddsd.dwFlags        = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;    \r
+  ddsd.dwFlags        = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;\r
   ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;\r
-  ddsd.dwWidth        = 320;\r
-  ddsd.dwHeight       = 240;\r
+  ddsd.dwWidth        = EmuWidth;\r
+  ddsd.dwHeight       = EmuHeight;\r
 \r
   ret = m_pDD->CreateSurface( &ddsd, &m_pddsBackBuffer, NULL );\r
-  if (ret) { LOGFAIL(); return 1; }\r
+  if (ret) { LOGFAIL(); goto fail; }\r
 \r
   // clipper\r
-  LPDIRECTDRAWCLIPPER pcClipper = NULL;\r
   ret = m_pDD->CreateClipper( 0, &pcClipper, NULL );\r
-  if (ret) { LOGFAIL(); return 1; }\r
+  if (ret) { LOGFAIL(); goto fail; }\r
 \r
   ret = pcClipper->SetHWnd( 0, FrameWnd );\r
-  if (ret) { LOGFAIL(); return 1; }\r
+  if (ret) { LOGFAIL(); goto fail; }\r
 \r
   ret = m_pddsFrontBuffer->SetClipper( pcClipper );\r
-  if (ret) { LOGFAIL(); return 1; }\r
+  if (ret) { LOGFAIL(); goto fail; }\r
 \r
   RELEASE(pcClipper);\r
+  return 0;\r
 \r
-#if 0\r
+fail:\r
+  RELEASE(pcClipper);\r
+  DirectExitDDraw();\r
+  return 1;\r
+}\r
+\r
+static int DirectScreenDDraw()\r
+{\r
   DDSURFACEDESC2 sd;\r
+  unsigned short *ps=EmuScreen;\r
+  int ret, x, y;\r
+\r
   memset(&sd, 0, sizeof(sd));\r
   sd.dwSize = sizeof(sd);\r
   ret = m_pddsBackBuffer->Lock(NULL, &sd, DDLOCK_SURFACEMEMORYPTR|DDLOCK_WAIT|DDLOCK_WRITEONLY, NULL);\r
   if (ret) { LOGFAIL(); return 1; }\r
 \r
-  memset(sd.lpSurface, 0xcc, 200*200);\r
+  //dprintf2("w: %i h: %i pi: %i pf: %i\n", sd.dwWidth, sd.dwHeight, sd.lPitch, sd.ddpfPixelFormat.dwRGBBitCount);\r
+\r
+  if (sd.ddpfPixelFormat.dwRGBBitCount == 32)\r
+  {\r
+    int *dst = (int *)sd.lpSurface;\r
+    for (y = 0; y < EmuHeight; y++)\r
+    {\r
+      for (x = 0; x < EmuWidth; x++)\r
+      {\r
+        int s = *ps++;\r
+        dst[x] = ((s&0xf800)<<8) | ((s&0x07e0)<<5) | ((s&0x001f)<<3);\r
+      }\r
+      dst = (int *)((char *)dst + sd.lPitch);\r
+    }\r
+  }\r
+  else if (sd.ddpfPixelFormat.dwRGBBitCount == 16)\r
+  {\r
+    unsigned short *dst = (unsigned short *)sd.lpSurface;\r
+    for (y = 0; y < EmuHeight; y++)\r
+    {\r
+      memcpy(dst, ps, EmuWidth*2);\r
+      ps += EmuWidth;\r
+      dst = (unsigned short *)((char *)dst + sd.lPitch);\r
+    }\r
+  }\r
+  else\r
+  {\r
+    LOGFAIL();\r
+  }\r
 \r
   ret = m_pddsBackBuffer->Unlock(NULL);\r
   if (ret) { LOGFAIL(); return 1; }\r
-#else\r
-    DDBLTFX ddbltfx;\r
-    ZeroMemory( &ddbltfx, sizeof(ddbltfx) );\r
-    ddbltfx.dwSize      = sizeof(ddbltfx);\r
-    ddbltfx.dwFillColor = 0xff00;\r
+  return 0;\r
+}\r
 \r
-    ret = m_pddsBackBuffer->Blt( NULL, NULL, NULL, DDBLT_COLORFILL, &ddbltfx );\r
-#endif\r
+static int DirectClearDDraw(unsigned int colour)\r
+{\r
+  int ret;\r
+  DDBLTFX ddbltfx;\r
+  ZeroMemory( &ddbltfx, sizeof(ddbltfx) );\r
+  ddbltfx.dwSize      = sizeof(ddbltfx);\r
+  ddbltfx.dwFillColor = colour;\r
 \r
-  ret = m_pddsFrontBuffer->Blt(NULL, m_pddsBackBuffer, NULL, DDBLT_WAIT, NULL);\r
-  if (ret) { LOGFAIL(); return 1; }\r
-Sleep(2000);\r
-/*   Sleep(500);\r
-  ret = m_pddsFrontBuffer->Blt(NULL, m_pddsBackBuffer, NULL, DDBLT_WAIT, NULL);\r
+  if (m_pddsBackBuffer != NULL)\r
+    ret = m_pddsBackBuffer->Blt( NULL, NULL, NULL, DDBLT_COLORFILL, &ddbltfx );\r
   if (ret) { LOGFAIL(); return 1; }\r
-   Sleep(500);\r
-  ret = m_pddsFrontBuffer->Blt(NULL, m_pddsBackBuffer, NULL, DDBLT_WAIT, NULL);\r
+  return 0;\r
+}\r
+\r
+static int DirectPresentDDraw()\r
+{\r
+  int ret = m_pddsFrontBuffer->Blt(&FrameRectMy, m_pddsBackBuffer, NULL, DDBLT_WAIT, NULL);\r
   if (ret) { LOGFAIL(); return 1; }\r
-*/\r
   return 0;\r
 }\r
 \r
 \r
+/* D3D */\r
+\r
 int DirectInit()\r
 {\r
-  D3DPRESENT_PARAMETERS d3dpp; \r
+  D3DPRESENT_PARAMETERS d3dpp;\r
   D3DDISPLAYMODE mode;\r
   int i,u,ret=0;\r
 \r
@@ -119,6 +168,7 @@ int DirectInit()
   d3dpp.BackBufferHeight=MainHeight;\r
   d3dpp.BackBufferCount =1;\r
   d3dpp.SwapEffect=D3DSWAPEFFECT_DISCARD;\r
+  d3dpp.MultiSampleType =D3DMULTISAMPLE_NONE;\r
 \r
 #ifdef _XBOX\r
   d3dpp.BackBufferFormat=D3DFMT_X8R8G8B8;\r
@@ -127,6 +177,7 @@ int DirectInit()
   Direct3D->GetAdapterDisplayMode(D3DADAPTER_DEFAULT,&mode);\r
   d3dpp.BackBufferFormat=mode.Format;\r
   d3dpp.Windowed=1;\r
+  d3dpp.hDeviceWindow=FrameWnd;\r
 #endif\r
 \r
   // Try to create a device with hardware vertex processing:\r
@@ -201,10 +252,13 @@ void DirectExit()
   //FontExit();\r
   TexScreenExit();\r
 \r
+  // d3d\r
   RELEASE(VertexBuffer)\r
   RELEASE(DirectBack)\r
   RELEASE(Device)\r
   RELEASE(Direct3D)\r
+\r
+  DirectExitDDraw();\r
 }\r
 \r
 \r
@@ -251,12 +305,18 @@ static int MakeVertexList()
 \r
 int DirectClear(unsigned int colour)\r
 {\r
+  if (Device == NULL)\r
+    return DirectClearDDraw(colour);\r
+\r
   Device->Clear(0,NULL,D3DCLEAR_TARGET,colour,1.0f,0);\r
   return 0;\r
 }\r
 \r
 int DirectPresent()\r
 {\r
+  if (Device == NULL)\r
+    return DirectPresentDDraw();\r
+\r
   Device->Present(NULL,NULL,NULL,NULL);\r
   return 0;\r
 }\r
@@ -270,7 +330,7 @@ static int SetupMatrices()
   float nudgex=0.0f,nudgey=0.0f;\r
 \r
   memset(&mat,0,sizeof(mat));\r
-  \r
+\r
   mat.m[0][0]=mat.m[1][1]=mat.m[2][2]=mat.m[3][3]=1.0f;\r
   Device->SetTransform(D3DTS_WORLD,&mat);\r
 \r
@@ -297,6 +357,9 @@ int DirectScreen()
   unsigned char *lock=NULL;\r
   int ret;\r
 \r
+  if (Device == NULL)\r
+    return DirectScreenDDraw();\r
+\r
   // Copy the screen to the screen texture:\r
 #ifdef _XBOX\r
   TexScreenSwizzle();\r
@@ -315,18 +378,12 @@ int DirectScreen()
   memcpy(lock,VertexList,sizeof(VertexList));\r
   VertexBuffer->Unlock();\r
 \r
-  ret=Device->BeginScene();\r
-  if (ret) dprintf2("BeginScene failed\n");\r
-  ret=Device->SetTexture(0,TexScreen);\r
-  if (ret) dprintf2("SetTexture failed\n");\r
-  ret=Device->SetStreamSource(0,VertexBuffer,sizeof(CustomVertex));\r
-  if (ret) dprintf2("SetStreamSource failed\n");\r
-  ret=Device->SetVertexShader(D3DFVF_CUSTOMVERTEX);\r
-  if (ret) dprintf2("SetVertexShader failed\n");\r
-  ret=Device->DrawPrimitive(D3DPT_TRIANGLESTRIP,0,2);\r
-  if (ret) dprintf2("DrawPrimitive failed\n");\r
-  ret=Device->EndScene();\r
-  if (ret) dprintf2("EndScene failed\n");\r
+  Device->BeginScene();\r
+  Device->SetTexture(0,TexScreen);\r
+  Device->SetStreamSource(0,VertexBuffer,sizeof(CustomVertex));\r
+  Device->SetVertexShader(D3DFVF_CUSTOMVERTEX);\r
+  Device->DrawPrimitive(D3DPT_TRIANGLESTRIP,0,2);\r
+  Device->EndScene();\r
 \r
   return 0;\r
 }\r

diff --git a/platform/win32/GenaDrive/Emu.cpp b/platform/win32/GenaDrive/Emu.cpp
index 79938b2..75f6f69 100644 (file)
--- a/platform/win32/GenaDrive/Emu.cpp
+++ b/platform/win32/GenaDrive/Emu.cpp
@@ -2,7 +2,7 @@
 #include "app.h"\r
 \r
 unsigned short *EmuScreen=NULL;\r
-int EmuWidth=0,EmuHeight=0;\r
+int EmuWidth=320,EmuHeight=224;\r
 static int EmuScan(unsigned int num, void *sdata);\r
 unsigned char *PicoDraw2FB = NULL;\r
 \r
@@ -66,7 +66,9 @@ int EmuFrame()
 \r
   PicoPad[0]=input;\r
 \r
-  PsndOut=(short *)DSoundNext; PicoFrame(); PsndOut=NULL;\r
+  PsndOut=(short *)DSoundNext;\r
+  PicoFrame();\r
+  //PsndOut=NULL;\r
 \r
   return 0;\r
 }\r

diff --git a/platform/win32/GenaDrive/Loop.cpp b/platform/win32/GenaDrive/Loop.cpp
index 305c27d..b4b3eec 100644 (file)
--- a/platform/win32/GenaDrive/Loop.cpp
+++ b/platform/win32/GenaDrive/Loop.cpp
@@ -13,11 +13,11 @@ int LoopInit()
   // bits LSb->MSb:\r
   // enable_ym2612&dac, enable_sn76496, enable_z80, stereo_sound;\r
   // alt_renderer, 6button_gamepad, accurate_timing, accurate_sprites\r
-  PicoOpt=0xbccf;\r
+  PicoOpt=0xbcc7;\r
   PsndRate=44100;\r
 \r
   // Init Direct3D:\r
-  ret=DirectInit(); if (ret) { error("Direct3D init failed"); return 1; }\r
+  ret=DirectInit(); if (ret) { error("DirectX video init failed"); return 1; }\r
   InputInit();\r
 \r
   // Init DirectSound:\r
@@ -108,7 +108,7 @@ static int ModeUpdate()
 \r
   if (LoopMode==8) { DoGame(); return 0; }\r
 \r
-  if (DSoundNext) memset(DSoundNext,0,PsndLen<<2);\r
+//  if (DSoundNext) memset(DSoundNext,0,PsndLen<<2);\r
 \r
 //  if (LoopMode==2) { FileMenu.scan(); LoopMode++; return 0; }\r
 //  if (LoopMode==3) { MenuUpdate(); return 0; }\r

diff --git a/platform/win32/GenaDrive/Main.cpp b/platform/win32/GenaDrive/Main.cpp
index acc8fcd..f5f41cc 100644 (file)
--- a/platform/win32/GenaDrive/Main.cpp
+++ b/platform/win32/GenaDrive/Main.cpp
@@ -5,14 +5,21 @@
 \r
 char *romname;\r
 HWND FrameWnd=NULL;\r
+RECT FrameRectMy;\r
 \r
 int MainWidth=720,MainHeight=480;\r
 \r
 // Window proc for the frame window:\r
 static LRESULT CALLBACK WndProc(HWND hwnd,UINT msg,WPARAM wparam,LPARAM lparam)\r
 {\r
-  if (msg==WM_CLOSE) { PostQuitMessage(0); return 0; }\r
-  if (msg==WM_DESTROY) FrameWnd=NULL; // Blank handle\r
+  switch (msg)\r
+  {\r
+    case WM_CLOSE:   PostQuitMessage(0); return 0;\r
+    case WM_DESTROY: FrameWnd=NULL; break; // Blank handle\r
+    case WM_SIZE:\r
+    case WM_MOVE:\r
+    case WM_SIZING:  GetWindowRect(hwnd, &FrameRectMy); break;\r
+  }\r
 \r
   return DefWindowProc(hwnd,msg,wparam,lparam);\r
 }\r
@@ -55,6 +62,10 @@ static int FrameInit()
   FrameWnd=CreateWindow(wc.lpszClassName,"PicoDrive " VERSION,style|WS_VISIBLE,\r
     left,top,width,height,NULL,NULL,NULL,NULL);\r
 \r
+  ShowWindow(FrameWnd, SW_NORMAL);\r
+  UpdateWindow(FrameWnd);\r
+  GetWindowRect(FrameWnd, &FrameRectMy);\r
+\r
   return 0;\r
 }\r
 \r
@@ -75,15 +86,16 @@ int WINAPI WinMain(HINSTANCE,HINSTANCE,LPSTR cmdline,int)
   unsigned char *rom_data = 0;\r
   unsigned int rom_size = 0;\r
 \r
+  static char rompath[MAX_PATH] = { 0, };\r
+  pm_file *rom = NULL;\r
+\r
   FrameInit();\r
   ret=LoopInit(); if (ret) goto end0;\r
 \r
   // notaz: load rom\r
-  static char rompath[MAX_PATH]; rompath[0] = 0;\r
   strcpy(rompath, cmdline + (cmdline[0] == '\"' ? 1 : 0));\r
   if(rompath[strlen(rompath)-1] == '\"') rompath[strlen(rompath)-1] = 0;\r
 \r
-  pm_file *rom = 0;\r
   if(strlen(rompath) > 4) rom = pm_open(rompath);\r
   if(!rom) {\r
     OPENFILENAME of; ZeroMemory(&of, sizeof(OPENFILENAME));\r

diff --git a/platform/win32/GenaDrive/Makefile.vc b/platform/win32/GenaDrive/Makefile.vc
index 896b8b9..3a3b44f 100644 (file)
--- a/platform/win32/GenaDrive/Makefile.vc
+++ b/platform/win32/GenaDrive/Makefile.vc
@@ -55,3 +55,13 @@ PicoDrive.exe : $(OBJ)
 \r
 clean:\r
        -del $(OBJ) PicoDrive.exe\r
+\r
+\r
+test.exe : test.cpp\r
+       cl $(CFLAGS) test.cpp user32.lib d3dx8.lib d3d8.lib\r
+\r
+dxtut1.exe : dxtut1.cpp\r
+       cl $(CFLAGS) dxtut1.cpp user32.lib d3d8.lib\r
+\r
+# d3dx8.lib\r
+\r

diff --git a/platform/win32/GenaDrive/app.h b/platform/win32/GenaDrive/app.h
index 3113a29..12a5ea9 100644 (file)
--- a/platform/win32/GenaDrive/app.h
+++ b/platform/win32/GenaDrive/app.h
@@ -13,6 +13,10 @@
 \r
 #define RELEASE(x) if (x) x->Release();  x=NULL;\r
 \r
+#ifndef __FUNCTION__\r
+#define __FUNCTION__ ""\r
+#endif\r
+\r
 #define LOGFAIL() dprintf2("fail: %s %s:%i\n", __FUNCTION__, __FILE__, __LINE__)\r
 \r
 \r
@@ -56,6 +60,7 @@ extern "C" int dprintf2(char *format, ...);
 // Main.cpp\r
 extern char *romname;\r
 extern HWND FrameWnd;\r
+extern RECT FrameRectMy;\r
 extern int MainWidth,MainHeight;\r
 extern void error(char *text);\r
 \r

diff --git a/platform/win32/GenaDrive/port_config.h b/platform/win32/GenaDrive/port_config.h
index 44b049a..2a405ac 100644 (file)
--- a/platform/win32/GenaDrive/port_config.h
+++ b/platform/win32/GenaDrive/port_config.h
@@ -7,6 +7,7 @@
 #define START_ROW  0 // which row of tiles to start rendering at?\r
 #define END_ROW   28 // ..end\r
 \r
+#define SIMPLE_WRITE_SOUND     1\r
 #define mix_32_to_16l_stereo_lvl mix_32_to_16l_stereo\r
 \r
 // pico.c\r