Bladeren bron

Updated sdl2 unit

GLScene 5 jaren geleden
bovenliggende
commit
42ad98c26c
2 gewijzigde bestanden met toevoegingen van 29 en 28 verwijderingen
  1. 2 2
      Source/SDL2.pas
  2. 27 26
      external/SetupDLLs.bat

+ 2 - 2
Source/SDL2.pas

@@ -43,9 +43,9 @@ const
 
 
   {$IFDEF MSWINDOWS}
   {$IFDEF MSWINDOWS}
    {$IFDEF WIN64}
    {$IFDEF WIN64}
-     SDL_LibName = 'sdl264.dll';
+     SDL_LibName = 'sdl2_64.dll';
    {$ELSE}
    {$ELSE}
-     SDL_LibName = 'sdl2.dll';
+     SDL_LibName = 'sdl2_32.dll';
    {$ENDIF}
    {$ENDIF}
   {$ENDIF}
   {$ENDIF}
 
 

+ 27 - 26
external/SetupDLLs.bat

@@ -2,61 +2,62 @@
 echo Copying DLLs to the Windows System32 and SysWOW64 directories
 echo Copying DLLs to the Windows System32 and SysWOW64 directories
 echo Copying nVidia CG DLLs
 echo Copying nVidia CG DLLs
 rem win32
 rem win32
-copy cg.dll %SystemRoot%\SysWOW64\
-copy cgGL.dll %SystemRoot%\SysWOW64\
+copy "%~dp0cg.dll" %SystemRoot%\SysWOW64\
+copy "%~dp0cgGL.dll" %SystemRoot%\SysWOW64\
 rem win64
 rem win64
-copy cg.dll %SystemRoot%\System32\
-copy cgGL.dll %SystemRoot%\System32\
+copy "%~dp0cg.dll" %SystemRoot%\System32\
+copy "%~dp0cgGL.dll" %SystemRoot%\System32\
 
 
 echo.
 echo.
 echo Copying SDL2 DLLs
 echo Copying SDL2 DLLs
 rem win32
 rem win32
-copy sdl2.dll %SystemRoot%\SysWOW64\sdl2.dll
+copy "%~dp0sdl2_32.dll" %SystemRoot%\SysWOW64\sdl2_32.dll
 rem win64
 rem win64
-copy sdl264.dll %SystemRoot%\System32\sdl264.dll
+copy "%~dp0sdl2_64.dll" %SystemRoot%\System32\sdl2_64.dll
 
 
 echo.
 echo.
 echo Copying Sound DLLs
 echo Copying Sound DLLs
 rem win32
 rem win32
-copy bass32.dll %SystemRoot%\SysWOW64\
-copy fmod32.dll %SystemRoot%\SysWOW64\
-copy OpenAL32.dll %SystemRoot%\SysWOW64\
+copy "%~dp0bass32.dll" %SystemRoot%\SysWOW64\
+copy "%~dp0fmod32.dll" %SystemRoot%\SysWOW64\
+copy "%~dp0OpenAL32.dll" %SystemRoot%\SysWOW64\
 rem win64
 rem win64
-copy bass64.dll %SystemRoot%\System32\
-copy fmod64.dll %SystemRoot%\System32\
-copy OpenAL64.dll %SystemRoot%\System32\
+copy "%~dp0bass64.dll" %SystemRoot%\System32\
+copy "%~dp0fmod64.dll" %SystemRoot%\System32\
+copy "%~dp0OpenAL64.dll" %SystemRoot%\System32\
 
 
 echo.
 echo.
 echo Copying ODE DLLs
 echo Copying ODE DLLs
 rem win32
 rem win32
-copy ode32s.dll %SystemRoot%\SysWOW64\
-copy ode32d.dll %SystemRoot%\SysWOW64\
+copy "%~dp0ode32s.dll" %SystemRoot%\SysWOW64\
+copy "%~dp0ode32d.dll" %SystemRoot%\SysWOW64\
 rem win64
 rem win64
-copy ode64s.dll %SystemRoot%\System32\
-copy ode64d.dll %SystemRoot%\System32\
+copy "%~dp0ode64s.dll" %SystemRoot%\System32\
+copy "%~dp0ode64d.dll" %SystemRoot%\System32\
 
 
 echo.
 echo.
 echo Copying Newton DLLs
 echo Copying Newton DLLs
 rem win32
 rem win32
-copy newton32.dll %SystemRoot%\SysWOW64\
-copy dJointLibrary32.dll %SystemRoot%\SysWOW64\
+copy "%~dp0newton32.dll" %SystemRoot%\SysWOW64\
+copy "%~dp0dJointLibrary32.dll" %SystemRoot%\SysWOW64\
 rem win64
 rem win64
-copy newton64.dll %SystemRoot%\System32\
-copy dJointLibrary64.dll %SystemRoot%\System32\
+copy "%~dp0newton64.dll" %SystemRoot%\System32\
+copy "%~dp0dJointLibrary64.dll" %SystemRoot%\System32\
 
 
 echo.
 echo.
 echo Copying nVidia PhysX DLLs
 echo Copying nVidia PhysX DLLs
 rem win32
 rem win32
-copy PhysXwrap32.dll %SystemRoot%\SysWOW64\
+copy "%~dp0PhysXwrap32.dll" %SystemRoot%\SysWOW64\
 rem win64
 rem win64
-copy PhysXwrap64.dll %SystemRoot%\System32\
+copy "%~dp0PhysXwrap64.dll" %SystemRoot%\System32\
 
 
 echo.
 echo.
 echo Copying CUDA and zlib1 DLLs
 echo Copying CUDA and zlib1 DLLs
 rem win32
 rem win32
-copy cutil32.dll %SystemRoot%\SysWOW64\
-copy zlib1.dll %SystemRoot%\SysWOW64\
+copy "%~dp0cutil32.dll" %SystemRoot%\SysWOW64\
+copy "%~dp0zlib1.dll" %SystemRoot%\SysWOW64\
 rem win64
 rem win64
-copy cutil64.dll %SystemRoot%\System32\
-copy zlib1.dll %SystemRoot%\System32\
+copy "%~dp0cutil64.dll" %SystemRoot%\System32\
+copy "%~dp0zlib1.dll" %SystemRoot%\System32\
+
 pause
 pause