--- np2/win9x/compiler.h 2005/03/20 13:12:49 1.28 +++ np2/win9x/compiler.h 2011/02/02 09:57:52 1.38 @@ -20,7 +20,7 @@ #endif #define OSLINEBREAK_CRLF -#ifndef __GNUC__ +#if !defined(__GNUC__) typedef signed int SINT; typedef signed char SINT8; typedef unsigned char UINT8; @@ -37,6 +37,7 @@ typedef unsigned __int64 UINT64; #define vsnprintf _vsnprintf #else #include +typedef signed int SINT; typedef signed char SINT8; typedef unsigned char UINT8; typedef signed short SINT16; @@ -56,7 +57,7 @@ typedef signed __int64 SINT64; #define sigjmp_buf jmp_buf #define sigsetjmp(env, mask) setjmp(env) #define siglongjmp(env, val) longjmp(env, val) -#define msgbox(title, msg) MessageBox(NULL, msg, title, MB_OK) +#define msgbox(title, msg) __msgbox(title, msg) #define STRCALL __stdcall @@ -75,6 +76,7 @@ typedef signed __int64 SINT64; #include "common.h" +#include "win32sub.h" #include "milstr.h" #include "_memory.h" #include "rect.h" @@ -99,7 +101,10 @@ typedef signed __int64 SINT64; #define LABEL __declspec(naked) #define RELEASE(x) if (x) {(x)->Release(); (x) = NULL;} +#if !defined(_WIN64) #define OPNGENX86 +#endif + #define VERMOUTH_LIB #define MT32SOUND_DLL #define PARTSCALL __fastcall @@ -111,6 +116,7 @@ typedef signed __int64 SINT64; #define SOUNDCALL __fastcall #define VRAMCALL __fastcall #define SCRNCALL __fastcall +#define VERMOUTHCL __fastcall #if defined(OSLANG_SJIS) #define SUPPORT_SJIS @@ -142,7 +148,12 @@ typedef signed __int64 SINT64; #define SUPPORT_SASI #define SUPPORT_SCSI #if defined(TRACE) - #define SUPPORT_IDEIO +#define SUPPORT_IDEIO +#endif +#define SUPPORT_ARC +#define SUPPORT_ZLIB +#if !defined(_WIN64) +#define SUPPORT_DCLOCK #endif #define SUPPORT_RESUME @@ -151,3 +162,6 @@ typedef signed __int64 SINT64; #define SOUNDRESERVE 20 + +#define SUPPORT_TEXTCNV +