Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make engine windows checks work for 64bit builds
authoralfadur
Mon, 12 Nov 2018 20:30:06 +0300
changeset 14199 3c36a4e66c82
parent 14198 73c5ba3aac45
child 14200 1bdce164eb72
make engine windows checks work for 64bit builds
hedgewars/LuaPas.pas file | annotate | diff | comparison | revisions
hedgewars/SDLh.pas file | annotate | diff | comparison | revisions
hedgewars/hwengine.pas file | annotate | diff | comparison | revisions
hedgewars/options.inc file | annotate | diff | comparison | revisions
hedgewars/uPhysFSLayer.pas file | annotate | diff | comparison | revisions
hedgewars/uStore.pas file | annotate | diff | comparison | revisions
hedgewars/uVideoRec.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/LuaPas.pas	Mon Nov 12 20:05:24 2018 +0300
+++ b/hedgewars/LuaPas.pas	Mon Nov 12 20:30:06 2018 +0300
@@ -21,7 +21,7 @@
     {$IFDEF WIN32_VCPKG}'lua'{$ELSE}'liblua'{$ENDIF}
 {$ENDIF};
 
-{$IFNDEF WIN32}
+{$IFNDEF WINDOWS}
     {$linklib lua}
 {$ENDIF}
 
--- a/hedgewars/SDLh.pas	Mon Nov 12 20:05:24 2018 +0300
+++ b/hedgewars/SDLh.pas	Mon Nov 12 20:30:06 2018 +0300
@@ -59,7 +59,7 @@
 
 (*  SDL  *)
 const
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
     SDLLibName = 'SDL2.dll';
     SDL_TTFLibName = 'SDL2_ttf.dll';
     SDL_MixerLibName = 'SDL2_mixer.dll';
@@ -657,7 +657,7 @@
         fd: LongInt;
         end;
 {$ELSE}
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
     TWinbuffer = record
         data: Pointer;
         size, left: LongInt;
@@ -681,7 +681,7 @@
 {$IFDEF ANDROID}
             0: (androidio: TAndroidio);
 {$ELSE}
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
             0: (windowsio: TWindowsio);
 {$ENDIF}
 {$ENDIF}
@@ -1023,7 +1023,7 @@
                         sockets: PTCPSocket;
                         end;
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
      TThreadFunction = function (p: pointer): Longword; stdcall;
      pfnSDL_CurrentBeginThread = function (
         _Security: pointer; 
@@ -1145,7 +1145,7 @@
 
 (* remember to mark the threaded functions as 'cdecl; export;'
    (or have fun debugging nil arguments) *)
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
 // SDL uses wrapper in windows
 function  SDL_CreateThread(fn: Pointer; name: PChar; data: Pointer; bt: pfnSDL_CurrentBeginThread; et: pfnSDL_CurrentEndThread): PSDL_Thread; cdecl; external SDLLibName;
 function  SDL_CreateThread(fn: Pointer; name: PChar; data: Pointer): PSDL_Thread; cdecl; overload;
@@ -1183,7 +1183,7 @@
 function  SDL_JoystickGetButton(joy: PSDL_Joystick; button: LongInt): Byte; cdecl; external SDLLibName;
 procedure SDL_JoystickClose(joy: PSDL_Joystick); cdecl; external SDLLibName;
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
 function SDL_putenv(const text: PChar): LongInt; cdecl; external SDLLibName;
 function SDL_getenv(const text: PChar): PChar; cdecl; external SDLLibName;
 {$ENDIF}
@@ -1321,7 +1321,7 @@
                   (PByteArray(buf)^[0] shl 24)
 end;
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
 function  SDL_CreateThread(fn: Pointer; name: PChar; data: Pointer): PSDL_Thread; cdecl;
 begin
     SDL_CreateThread:= SDL_CreateThread(fn, name, data, nil, nil)
--- a/hedgewars/hwengine.pas	Mon Nov 12 20:05:24 2018 +0300
+++ b/hedgewars/hwengine.pas	Mon Nov 12 20:30:06 2018 +0300
@@ -18,7 +18,7 @@
 
 {$INCLUDE "options.inc"}
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
 {$R res/hwengine.rc}
 {$ENDIF}
 
@@ -36,7 +36,7 @@
      {$IFDEF USE_VIDEO_RECORDING}, uVideoRec {$ENDIF}
      {$IFDEF USE_TOUCH_INTERFACE}, uTouch {$ENDIF}
      {$IFDEF ANDROID}, GLUnit{$ENDIF}
-     {$IFDEF WIN32}, dynlibs{$ENDIF}
+     {$IFDEF WINDOWS}, dynlibs{$ENDIF}
      ;
 
 {$IFDEF HWLIBRARY}
@@ -59,7 +59,7 @@
 {$ENDIF}
 {$ENDIF}
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
 type TSetProcessDpiAwareness = function(value: Integer): Integer; stdcall;
 var SetProcessDpiAwareness: TSetProcessDpiAwareness;
 var ShcoreLibHandle: TLibHandle;
@@ -637,7 +637,7 @@
 begin
 {$ENDIF}
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
     ShcoreLibHandle := LoadLibrary('Shcore.dll');
     if (ShcoreLibHandle <> 0) then
     begin
--- a/hedgewars/options.inc	Mon Nov 12 20:05:24 2018 +0300
+++ b/hedgewars/options.inc	Mon Nov 12 20:30:06 2018 +0300
@@ -52,7 +52,7 @@
 {$ENDIF}
 
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
     {$DEFINE USE_CONTEXT_RESTORE}
 {$ENDIF}
 
--- a/hedgewars/uPhysFSLayer.pas	Mon Nov 12 20:05:24 2018 +0300
+++ b/hedgewars/uPhysFSLayer.pas	Mon Nov 12 20:30:06 2018 +0300
@@ -14,7 +14,7 @@
 const PhyslayerLibName =
     {$IFDEF WIN32_VCPKG}'physlayer'{$ELSE}'libphyslayer'{$ENDIF};
 
-{$IFNDEF WIN32}
+{$IFNDEF WINDOWS}
     {$linklib physfs}
     {$linklib physlayer}
 {$ENDIF}
--- a/hedgewars/uStore.pas	Mon Nov 12 20:05:24 2018 +0300
+++ b/hedgewars/uStore.pas	Mon Nov 12 20:30:06 2018 +0300
@@ -1219,7 +1219,7 @@
         end;
 
     // these attributes must be set up before creating the sdl window
-{$IFNDEF WIN32}
+{$IFNDEF WINDOWS}
 (* On a large number of testers machines, SDL default to software rendering
    when opengl attributes were set. These attributes were "set" after
    CreateWindow in .15, which probably did nothing.
--- a/hedgewars/uVideoRec.pas	Mon Nov 12 20:05:24 2018 +0300
+++ b/hedgewars/uVideoRec.pas	Mon Nov 12 20:30:06 2018 +0300
@@ -27,7 +27,7 @@
 end.
 {$ELSE}
 
-{$IFNDEF WIN32}
+{$IFNDEF WINDOWS}
     {$linklib avwrapper}
 {$ENDIF}
hedgewars