final tweaks for 1.55 release

[picodrive.git] / platform / win32 / GenaDrive / app.h

diff --git a/platform/win32/GenaDrive/app.h b/platform/win32/GenaDrive/app.h
index 5fcf5b7..9bac46c 100644 (file)
--- a/platform/win32/GenaDrive/app.h
+++ b/platform/win32/GenaDrive/app.h
@@ -7,16 +7,22 @@
 \r
 #include <d3dx8.h>\r
 \r
-#include <Pico/Pico.h>\r
-\r
-#define PI 3.14159265f\r
+#include <pico/pico.h>\r
 \r
 #define RELEASE(x) if (x) x->Release();  x=NULL;\r
 \r
+#ifndef __FUNCTION__\r
+#define __FUNCTION__ ""\r
+#endif\r
+\r
+#define LOGFAIL() lprintf("fail: %s %s:%i\n", __FUNCTION__, __FILE__, __LINE__)\r
+\r
 \r
 // Emu.cpp\r
 extern unsigned short *EmuScreen;\r
 extern int EmuWidth,EmuHeight;\r
+extern RECT EmuScreenRect;\r
+extern int PicoPadAdd;\r
 int EmuInit();\r
 void EmuExit();\r
 int EmuRomLoad(char *name);\r
@@ -36,34 +42,24 @@ void InputExit();
 int InputUpdate();\r
 int InputLightCal(int cx,int cy,int ux,int uy);\r
 \r
-// LightCal.cpp\r
-int LightCalReset();\r
-int LightCalUpdate();\r
-int LightCalRender();\r
-\r
 // Loop.cpp\r
-extern char LoopQuit;\r
+extern char LoopQuit,LoopWait,LoopWaiting;\r
 extern int LoopMode;\r
 \r
 int LoopInit();\r
 void LoopExit();\r
 int LoopCode();\r
 //extern "C" int dprintf(char *format, ...);\r
-extern "C" int dprintf2(char *format, ...);\r
+extern "C" int lprintf(char *format, ...);\r
 \r
 // Main.cpp\r
 extern char *romname;\r
 extern HWND FrameWnd;\r
+extern RECT FrameRectMy;\r
 extern int MainWidth,MainHeight;\r
+extern int lock_to_1_1;\r
 extern void error(char *text);\r
 \r
-// Rom.cpp\r
-extern unsigned char *RomData;\r
-extern int RomLen;\r
-extern char RomName[260];\r
-int RomLoad();\r
-void RomFree();\r
-\r
 // --------------------------------------------\r
 // Direct.cpp\r
 extern IDirect3DDevice8 *Device;\r
@@ -79,15 +75,6 @@ int DSoundInit();
 void DSoundExit();\r
 int DSoundUpdate();\r
 extern short *DSoundNext; // Buffer for next sound data to put in loop\r
-//extern int DSoundSeg; // Seg length in samples\r
-void DSoundMute();\r
-void DSoundUnMute();\r
-\r
-// Font.cpp\r
-int FontInit();\r
-void FontExit();\r
-int FontSetColour(unsigned int colour);\r
-int FontText(WCHAR *,int,int);\r
 \r
 // TexScreen.cpp\r
 extern IDirect3DTexture8 *TexScreen;\r