diff options
40 files changed, 53 insertions, 3 deletions
diff --git a/Makefile.mingw b/Makefile.mingw index 7ffabe4102..3ac62c0df8 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -53,7 +53,7 @@ LIBS += -lvorbisfile -lvorbis -logg # DISABLE_SCUMM = 1 # DISABLE_SIMON = 1 # DISABLE_SKY = 1 -DISABLE_BS2 = 1 +# DISABLE_BS2 = 1 ####################################################################### diff --git a/sword2/anims.cpp b/sword2/anims.cpp index ad3f5f80ae..6449939154 100644 --- a/sword2/anims.cpp +++ b/sword2/anims.cpp @@ -27,6 +27,7 @@ #include <stdio.h> // for sprintf #include <string.h> +#include "stdafx.h" #include "common/scummsys.h" #include "driver/driver96.h" #include "anims.h" diff --git a/sword2/build_display.cpp b/sword2/build_display.cpp index 53f1c99e4f..d1fdce5d40 100644 --- a/sword2/build_display.cpp +++ b/sword2/build_display.cpp @@ -27,6 +27,7 @@ //#include <windows.h> //#include <windowsx.h> +#include "stdafx.h" #include "driver/driver96.h" #include "build_display.h" #include "console.h" diff --git a/sword2/console.cpp b/sword2/console.cpp index 3ae37ae23a..9b4fb2b754 100644 --- a/sword2/console.cpp +++ b/sword2/console.cpp @@ -17,6 +17,7 @@ * $Header$ */ +#include "stdafx.h" #include "driver/driver96.h" uint32 console_status=0; //0 off // LEFT IN RELEASE VERSION diff --git a/sword2/controls.cpp b/sword2/controls.cpp index b3d42c98fd..37e81b95c3 100644 --- a/sword2/controls.cpp +++ b/sword2/controls.cpp @@ -25,6 +25,7 @@ //#include "src\driver96.h" +#include "stdafx.h" #include "build_display.h" #include "console.h" #include "controls.h" diff --git a/sword2/debug.cpp b/sword2/debug.cpp index 8ca012cb35..b308f3b7f1 100644 --- a/sword2/debug.cpp +++ b/sword2/debug.cpp @@ -21,6 +21,7 @@ #include <stdarg.h> // for ExitWithReport, which stays in RELEASE version #include <stdio.h> +#include "stdafx.h" #include "driver/driver96.h" #include "debug.h" //-------------------------------------------------------------------------------------- diff --git a/sword2/driver/_console.cpp b/sword2/driver/_console.cpp index 544f90685c..c501efdf6f 100644 --- a/sword2/driver/_console.cpp +++ b/sword2/driver/_console.cpp @@ -57,6 +57,7 @@ //#include "ddraw.h" +#include "stdafx.h" #include "driver96.h" #include "d_draw.h" diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp index da2627a3f1..8d9cd36769 100644 --- a/sword2/driver/_mouse.cpp +++ b/sword2/driver/_mouse.cpp @@ -131,6 +131,7 @@ //#include "ddraw.h" +#include "stdafx.h" #include "driver96.h" #include "d_draw.h" diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp index 3d31118e71..26cf7a93b1 100644 --- a/sword2/driver/d_draw.cpp +++ b/sword2/driver/d_draw.cpp @@ -26,6 +26,7 @@ //#include "ddraw.h" +#include "stdafx.h" #include "driver96.h" #include "rdwin.h" #include "_mouse.h" diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index d3ec3200ae..78c69bf6e7 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -355,6 +355,7 @@ //#include <windowsx.h> #include <stdio.h> +#include "stdafx.h" #include "driver96.h" #include "rdwin.h" // for hwnd. diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h index dfa812bac0..a9b8f35a49 100644 --- a/sword2/driver/driver96.h +++ b/sword2/driver/driver96.h @@ -1070,7 +1070,7 @@ extern "C" { // // defines specific to windows headers... -#ifndef _MSC_VER +#ifndef WIN32 #define SEM_FAILCRITICALERRORS 1 #define FILE_ATTRIBUTE_NORMAL 0x80 @@ -1254,9 +1254,11 @@ extern "C" { typedef int BOOL; #define TRUE 1 #define FALSE 0 -typedef uint32 DWORD; +#ifndef WIN32 +typedef uint32 DWORD; typedef long int LARGE_INTEGER; +#endif // // Structure definitions @@ -1431,6 +1433,7 @@ typedef struct } _drvKeyStatus; +#ifndef WIN32 // should probably remove this struct as it just replaces a windows struct... typedef struct { DWORD dwLength; @@ -1442,6 +1445,7 @@ typedef struct { DWORD dwTotalVirtual; DWORD dwAvailVirtual; } GCC_PACK MEMORYSTATUS; +#endif // // Function Prototypes @@ -1606,6 +1610,7 @@ extern int32 SetFxVolumePan(int32 id, uint8 vol, int8 pan); extern int32 SetFxIdVolume(int32 id, uint8 vol); +#ifndef WIN32 //----------------------------------------------------------------------------- // Misc functions - from misc.cpp //----------------------------------------------------------------------------- @@ -1618,6 +1623,7 @@ extern void GetCurrentDirectory(uint32 max, char* path); extern int32 GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, DWORD *dwMaxCompLength, DWORD *dwFSFlags, uint8 *, uint32 a); extern void _mkdir(const char *pathname); extern void GetModuleFileName(void *module, char *destStr, uint32 maxLen); +#endif //----------------------------------------------------------------------------- //Macro for calling error handler with source filename and line. diff --git a/sword2/driver/keyboard.cpp b/sword2/driver/keyboard.cpp index db21de4395..1f0e3f0932 100644 --- a/sword2/driver/keyboard.cpp +++ b/sword2/driver/keyboard.cpp @@ -65,6 +65,7 @@ //#include <windows.h> //#include <windowsx.h> +#include "stdafx.h" #include "driver96.h" uint8 keyBacklog = 0; // The number of key presses waiting to be processed. diff --git a/sword2/driver/language.cpp b/sword2/driver/language.cpp index b20eb1508c..13d482d834 100644 --- a/sword2/driver/language.cpp +++ b/sword2/driver/language.cpp @@ -63,6 +63,7 @@ //============================================================================= +#include "stdafx.h" #include "driver96.h" diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp index 564e302375..16efa5a53d 100644 --- a/sword2/driver/menu.cpp +++ b/sword2/driver/menu.cpp @@ -114,6 +114,7 @@ //#include "ddraw.h" +#include "stdafx.h" #include "driver96.h" #include "menu.h" #include "d_draw.h" diff --git a/sword2/driver/misc.cpp b/sword2/driver/misc.cpp index ce7ea76020..4819be7d49 100644 --- a/sword2/driver/misc.cpp +++ b/sword2/driver/misc.cpp @@ -17,12 +17,15 @@ * $Header$ */ +#include "stdafx.h" #include "driver96.h" #include "../sword2.h" +#ifndef WIN32 uint32 timeGetTime(void) { return g_bs2->_syst->get_msecs(); } +#endif void VirtualUnlock(uint8 *free_memman, uint32 total_free_memory) { warning("stub VirtualUnlock"); @@ -51,10 +54,12 @@ int32 GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, return 1; } +#ifndef WIN32 // FIXME wrap different platform specific mkdir calls and actually do something void _mkdir(const char *pathname) { warning("stub _mkdir %s", pathname); } +#endif void GetModuleFileName(void *module, char *destStr, uint32 maxLen) { warning("stub GetModuleFileName"); diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp index 5847cfff6b..ae097ce0c1 100644 --- a/sword2/driver/palette.cpp +++ b/sword2/driver/palette.cpp @@ -153,6 +153,7 @@ //#include "ddraw.h" +#include "stdafx.h" #include "driver96.h" #include "d_draw.h" diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp index 589a86e2ab..dda0137a44 100644 --- a/sword2/driver/render.cpp +++ b/sword2/driver/render.cpp @@ -201,6 +201,7 @@ //#include "ddraw.h" +#include "stdafx.h" #include "driver96.h" #include "d_draw.h" #include "rdwin.h" diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp index 33573405e2..5824b0c58e 100644 --- a/sword2/driver/sprite.cpp +++ b/sword2/driver/sprite.cpp @@ -267,6 +267,7 @@ //#include "ddraw.h" +#include "stdafx.h" #include "driver96.h" #include "d_draw.h" #include "render.h" diff --git a/sword2/events.cpp b/sword2/events.cpp index b7f339c99a..a27a927178 100644 --- a/sword2/events.cpp +++ b/sword2/events.cpp @@ -20,6 +20,7 @@ //------------------------------------------------------------------------------------ #include <stdio.h> +#include "stdafx.h" //#include "src\driver96.h" #include "console.h" #include "debug.h" diff --git a/sword2/function.cpp b/sword2/function.cpp index 214924a503..e6d4656b0f 100644 --- a/sword2/function.cpp +++ b/sword2/function.cpp @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdio.h> +#include "stdafx.h" #include "driver/driver96.h" #include "build_display.h" #include "credits.h" diff --git a/sword2/icons.cpp b/sword2/icons.cpp index 880fcbc0da..6d0e776110 100644 --- a/sword2/icons.cpp +++ b/sword2/icons.cpp @@ -21,6 +21,7 @@ #include <stdio.h> #include <stdlib.h> +#include "stdafx.h" #include "driver/driver96.h" #include "console.h" #include "icons.h" diff --git a/sword2/interpreter.cpp b/sword2/interpreter.cpp index 677666610f..d1a0d3e247 100644 --- a/sword2/interpreter.cpp +++ b/sword2/interpreter.cpp @@ -17,6 +17,8 @@ * $Header$ */ +#include "stdafx.h" + #ifndef INSIDE_LINC // Are we running in linc? #include "console.h" #endif diff --git a/sword2/layers.cpp b/sword2/layers.cpp index 0cf405407f..68cde27e85 100644 --- a/sword2/layers.cpp +++ b/sword2/layers.cpp @@ -30,6 +30,7 @@ #include <stdio.h> #include <stdlib.h> +#include "stdafx.h" #include "driver/driver96.h" #include "build_display.h" #include "console.h" diff --git a/sword2/logic.cpp b/sword2/logic.cpp index 4519badee8..167cf9dc17 100644 --- a/sword2/logic.cpp +++ b/sword2/logic.cpp @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdlib.h> +#include "stdafx.h" //#include "src\driver96.h" #include "build_display.h" #include "console.h" diff --git a/sword2/maketext.cpp b/sword2/maketext.cpp index d3bc036975..fef6cac73c 100644 --- a/sword2/maketext.cpp +++ b/sword2/maketext.cpp @@ -54,6 +54,7 @@ #include <stdlib.h> #include <string.h> +#include "stdafx.h" #include "driver/driver96.h" #include "console.h" #include "debug.h" diff --git a/sword2/mem_view.cpp b/sword2/mem_view.cpp index ee5b888e29..40c3193989 100644 --- a/sword2/mem_view.cpp +++ b/sword2/mem_view.cpp @@ -23,6 +23,7 @@ #include <stdlib.h> //#include <windows.h> +#include "stdafx.h" #include "driver/driver96.h" #include "build_display.h" #include "console.h" diff --git a/sword2/memory.cpp b/sword2/memory.cpp index a8fba5b780..b87ae331d9 100644 --- a/sword2/memory.cpp +++ b/sword2/memory.cpp @@ -33,6 +33,7 @@ #include <stdio.h> #include <stdlib.h> +#include "stdafx.h" #include "driver/driver96.h" #include "console.h" #include "debug.h" diff --git a/sword2/mouse.cpp b/sword2/mouse.cpp index 1ff9dff25c..e770a1c257 100644 --- a/sword2/mouse.cpp +++ b/sword2/mouse.cpp @@ -17,6 +17,7 @@ * $Header$ */ +#include "stdafx.h" #include "driver/driver96.h" #include "build_display.h" #include "console.h" diff --git a/sword2/protocol.cpp b/sword2/protocol.cpp index bfeb804dfe..ab942f6dbb 100644 --- a/sword2/protocol.cpp +++ b/sword2/protocol.cpp @@ -20,6 +20,7 @@ #include <stdio.h> //#include <windows.h> +#include "stdafx.h" //#include "src\driver96.h" #include "console.h" #include "debug.h" diff --git a/sword2/resman.cpp b/sword2/resman.cpp index 57ab6366c5..4e4e387f0a 100644 --- a/sword2/resman.cpp +++ b/sword2/resman.cpp @@ -21,6 +21,8 @@ #include <stdio.h> #include <stdlib.h> +#include "stdafx.h" + #include "engine.h" #include "driver/driver96.h" diff --git a/sword2/router.cpp b/sword2/router.cpp index 2fb498c79d..6fa7d02a09 100644 --- a/sword2/router.cpp +++ b/sword2/router.cpp @@ -81,6 +81,7 @@ */ +#include "stdafx.h" #include "driver/driver96.h" #include "console.h" #include "debug.h" diff --git a/sword2/save_rest.cpp b/sword2/save_rest.cpp index 10a374a7a3..4fefc9c6ba 100644 --- a/sword2/save_rest.cpp +++ b/sword2/save_rest.cpp @@ -31,6 +31,7 @@ #include <stdio.h> #include <stdlib.h> +#include "stdafx.h" #include "driver/driver96.h" #include "console.h" #include "defs.h" diff --git a/sword2/scroll.cpp b/sword2/scroll.cpp index 65148e00f3..5f07e332e4 100644 --- a/sword2/scroll.cpp +++ b/sword2/scroll.cpp @@ -22,6 +22,7 @@ #include <stdio.h> #include <stdlib.h> +#include "stdafx.h" //#include "src\driver96.h" #include "build_display.h" #include "debug.h" diff --git a/sword2/sound.cpp b/sword2/sound.cpp index e355d8f412..bf10f97d97 100644 --- a/sword2/sound.cpp +++ b/sword2/sound.cpp @@ -29,6 +29,7 @@ #include <stdio.h> +#include "stdafx.h" //#include "src\driver96.h" #include "console.h" #include "defs.h" // for RESULT diff --git a/sword2/speech.cpp b/sword2/speech.cpp index 69de909ed5..3cd28d512b 100644 --- a/sword2/speech.cpp +++ b/sword2/speech.cpp @@ -20,6 +20,7 @@ //------------------------------------------------------------------------------------ #include "stdafx.h" +#include "stdafx.h" //#include "src\driver96.h" #include "anims.h" #include "console.h" diff --git a/sword2/startup.cpp b/sword2/startup.cpp index 0096a389e2..048e9cb020 100644 --- a/sword2/startup.cpp +++ b/sword2/startup.cpp @@ -20,6 +20,7 @@ //------------------------------------------------------------------------------------ #include <stdio.h> +#include "stdafx.h" //#include "src\driver96.h" #include "build_display.h" #include "console.h" diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp index 0dd41af420..e9635a20db 100644 --- a/sword2/sword2.cpp +++ b/sword2/sword2.cpp @@ -22,6 +22,7 @@ #include <stdio.h> //#include <windows.h> +#include "stdafx.h" #include "driver/driver96.h" #include "common/gameDetector.h" #include "build_display.h" diff --git a/sword2/sync.cpp b/sword2/sync.cpp index 7f8454db52..b9ae1add1e 100644 --- a/sword2/sync.cpp +++ b/sword2/sync.cpp @@ -20,6 +20,7 @@ //------------------------------------------------------------------------------------ #include <stdio.h> +#include "stdafx.h" //#include "src\driver96.h" #include "console.h" #include "debug.h" diff --git a/sword2/tony_gsdk.cpp b/sword2/tony_gsdk.cpp index 6c6bb661c5..c6fcc34da1 100644 --- a/sword2/tony_gsdk.cpp +++ b/sword2/tony_gsdk.cpp @@ -34,6 +34,7 @@ #include <stdlib.h> #include <unistd.h> +#include "stdafx.h" //#include "src\driver96.h" #include "debug.h" #include "header.h" diff --git a/sword2/walker.cpp b/sword2/walker.cpp index 62b0624f93..93033e4862 100644 --- a/sword2/walker.cpp +++ b/sword2/walker.cpp @@ -35,6 +35,7 @@ //-------------------------------------------------------------------------------------- +#include "stdafx.h" //#include "src\driver96.h" #include "console.h" #include "defs.h" |