put "{$MODE ...}" directive in each source file; removed trailing spaces, and convert...

[d2df-sdl.git] / src / sfs / wadcvt.dpr

diff --git a/src/sfs/wadcvt.dpr b/src/sfs/wadcvt.dpr
index bd5933eb10f001c614d31f0372945175a84c0853..1e5f677a50fa19b374eb926fb00a7969f81d1f25 100644 (file)
--- a/src/sfs/wadcvt.dpr
+++ b/src/sfs/wadcvt.dpr
@@ -1,17 +1,17 @@
-{$IFDEF WIN32}
+{$MODE OBJFPC}
+{$IFDEF WINDOWS}
   {$APPTYPE CONSOLE}
 {$ENDIF}
-{$MODE DELPHI}
 program __wadcvt__;
 
 uses
   SysUtils,
   Classes,
-  SDL2 in '../lib/sdl2/sdl2.pas',
+  utils in '../shared/utils.pas',
+  xstreams in '../shared/xstreams.pas',
   sfs,
   sfsPlainFS,
   sfsZipFS,
-  sfsMemFS,
   zipper;
 
 
@@ -173,7 +173,7 @@ begin
   end;
 
   infname := ParamStr(1);
-  if not SFSStrEqu(ExtractFileExt(infname), '.wad') and not SFSStrEqu(ExtractFileExt(infname), '.dfwad') then
+  if not StrEquCI1251(ExtractFileExt(infname), '.wad') and not StrEquCI1251(ExtractFileExt(infname), '.dfwad') then
   begin
     writeln('wtf?!');
     Halt(1);