diff -r ce7396d4eaf7 -r 71626318f80e hedgewars/SDLh.pas --- a/hedgewars/SDLh.pas Tue Nov 05 11:04:26 2013 +0400 +++ b/hedgewars/SDLh.pas Wed Nov 06 00:59:33 2013 +0400 @@ -70,18 +70,34 @@ (* SDL *) const -{$IFDEF WIN32} - SDLLibName = 'SDL.dll'; - SDL_TTFLibName = 'SDL_ttf.dll'; - SDL_MixerLibName = 'SDL_mixer.dll'; - SDL_ImageLibName = 'SDL_image.dll'; - SDL_NetLibName = 'SDL_net.dll'; +{$IFDEF SDL2} + {$IFDEF WIN32} + SDLLibName = 'SDL2.dll'; + SDL_TTFLibName = 'SDL2_ttf.dll'; + SDL_MixerLibName = 'SDL2_mixer.dll'; + SDL_ImageLibName = 'SDL2_image.dll'; + SDL_NetLibName = 'SDL2_net.dll'; + {$ELSE} + SDLLibName = 'libSDL2'; + SDL_TTFLibName = 'libSDL2_ttf'; + SDL_MixerLibName = 'libSDL2_mixer'; + SDL_ImageLibName = 'libSDL2_image'; + SDL_NetLibName = 'libSDL2_net'; + {$ENDIF} {$ELSE} - SDLLibName = 'libSDL'; - SDL_TTFLibName = 'libSDL_ttf'; - SDL_MixerLibName = 'libSDL_mixer'; - SDL_ImageLibName = 'libSDL_image'; - SDL_NetLibName = 'libSDL_net'; + {$IFDEF WIN32} + SDLLibName = 'SDL.dll'; + SDL_TTFLibName = 'SDL_ttf.dll'; + SDL_MixerLibName = 'SDL_mixer.dll'; + SDL_ImageLibName = 'SDL_image.dll'; + SDL_NetLibName = 'SDL_net.dll'; + {$ELSE} + SDLLibName = 'libSDL'; + SDL_TTFLibName = 'libSDL_ttf'; + SDL_MixerLibName = 'libSDL_mixer'; + SDL_ImageLibName = 'libSDL_image'; + SDL_NetLibName = 'libSDL_net'; + {$ENDIF} {$ENDIF} /////////////////////////////////////////////////////////////////