From 0e714a8189d8f0586f0e9520a8ae55d09b9c32e8 Mon Sep 17 00:00:00 2001 From: f1fth_freed0m Date: Sat, 12 Apr 2008 23:00:18 +0000 Subject: started to implement the new folder structure (like suggested in the wiki) -merged Skins and Themes in Themes -moved some libs to Libraries git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1021 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UMain.pas | 2 +- Game/Code/config-win.inc | 14 +++++++------- Game/Code/lib/JEDI-SDL/SDL/Pas/sdl.pas | 2 +- Game/Code/lib/JEDI-SDL/SDL_Image/Pas/sdl_image.pas | 2 +- Game/Code/lib/JEDI-SDL/SDL_ttf/Pas/sdl_ttf.pas | 2 +- Game/Code/lib/SQLite/SQLite3.pas | 2 +- Game/Code/lib/bass/delphi/bass.pas | 2 +- Game/Code/lib/libpng/png.pas | 2 +- Game/Code/lib/projectM/0.9/projectM.pas | 2 +- Game/Code/lib/projectM/1.0/projectM.pas | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) (limited to 'Game') diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas index b6a4fe02..22aa4ad6 100644 --- a/Game/Code/Classes/UMain.pas +++ b/Game/Code/Classes/UMain.pas @@ -1094,7 +1094,7 @@ begin initialize_path( LogPath , Platform.GetLogPath ); initialize_path( SoundPath , Platform.GetGameSharedPath + 'Sounds' + PathDelim ); initialize_path( ThemePath , Platform.GetGameSharedPath + 'Themes' + PathDelim ); - initialize_path( SkinsPath , Platform.GetGameSharedPath + 'Skins' + PathDelim ); + initialize_path( SkinsPath , Platform.GetGameSharedPath + 'Themes' + PathDelim ); initialize_path( LanguagesPath , Platform.GetGameSharedPath + 'Languages' + PathDelim ); initialize_path( PluginPath , Platform.GetGameSharedPath + 'Plugins' + PathDelim ); initialize_path( VisualsPath , Platform.GetGameSharedPath + 'Visuals' + PathDelim ); diff --git a/Game/Code/config-win.inc b/Game/Code/config-win.inc index 749575ec..03f0414b 100644 --- a/Game/Code/config-win.inc +++ b/Game/Code/config-win.inc @@ -16,17 +16,17 @@ {$DEFINE HaveFFMpeg} {$IF Defined(HaveFFMpeg) and Defined(IncludeConstants)} - av__codec = 'avcodec-51'; + av__codec = 'Libraries\avcodec-51'; LIBAVCODEC_VERSION_MAJOR = 51; LIBAVCODEC_VERSION_MINOR = 16; LIBAVCODEC_VERSION_RELEASE = 0; - av__format = 'avformat-50'; + av__format = 'Libraries\avformat-50'; LIBAVFORMAT_VERSION_MAJOR = 50; LIBAVFORMAT_VERSION_MINOR = 5; LIBAVFORMAT_VERSION_RELEASE = 0; - av__util = 'avutil-49'; + av__util = 'Libraries\avutil-49'; LIBAVUTIL_VERSION_MAJOR = 49; LIBAVUTIL_VERSION_MINOR = 0; LIBAVUTIL_VERSION_RELEASE = 0; @@ -34,7 +34,7 @@ {$UNDEF HaveSWScale} {$IF Defined(HaveSWScale) and Defined(IncludeConstants)} - sw__scale = 'swscale-0'; + sw__scale = 'Libraries\swscale-0'; LIBSWSCALE_VERSION_MAJOR = 0; LIBSWSCALE_VERSION_MINOR = 5; LIBSWSCALE_VERSION_RELEASE = 0; @@ -48,7 +48,7 @@ {$DEFINE HaveProjectM} {$IFEND} {$IF Defined(HaveProjectM) and Defined(IncludeConstants)} - libprojectM = 'libprojectM'; + libprojectM = 'Libraries\libprojectM'; // Note: Un/Define HaveProjectM_0_9 or HaveProjectM_1_0_PLUS accordingly PROJECTM_VERSION_MAJOR = 0; PROJECTM_VERSION_MINOR = 98; @@ -57,7 +57,7 @@ {$UNDEF HavePortaudio} {$IF Defined(HavePortaudio) and Defined(IncludeConstants)} - libportaudio = 'portaudio_x86'; + libportaudio = 'Libraries\portaudio_x86'; PORTAUDIO_VERSION_MAJOR = 19; PORTAUDIO_VERSION_MINOR = 0; PORTAUDIO_VERSION_RELEASE = 0; @@ -65,6 +65,6 @@ {$UNDEF HavePortmixer} {$IF Defined(HavePortmixer) and Defined(IncludeConstants)} - libportmixer = 'portmixer'; + libportmixer = 'Libraries\portmixer'; {$IFEND} diff --git a/Game/Code/lib/JEDI-SDL/SDL/Pas/sdl.pas b/Game/Code/lib/JEDI-SDL/SDL/Pas/sdl.pas index 29bc7123..d2e30270 100644 --- a/Game/Code/lib/JEDI-SDL/SDL/Pas/sdl.pas +++ b/Game/Code/lib/JEDI-SDL/SDL/Pas/sdl.pas @@ -357,7 +357,7 @@ uses const {$IFDEF WINDOWS} - SDLLibName = 'SDL.dll'; + SDLLibName = 'Libraries\SDL.dll'; {$ENDIF} {$IFDEF UNIX} diff --git a/Game/Code/lib/JEDI-SDL/SDL_Image/Pas/sdl_image.pas b/Game/Code/lib/JEDI-SDL/SDL_Image/Pas/sdl_image.pas index d0699761..1013e322 100644 --- a/Game/Code/lib/JEDI-SDL/SDL_Image/Pas/sdl_image.pas +++ b/Game/Code/lib/JEDI-SDL/SDL_Image/Pas/sdl_image.pas @@ -144,7 +144,7 @@ uses const {$IFDEF WINDOWS} - SDL_ImageLibName = 'SDL_Image.dll'; + SDL_ImageLibName = 'Libraries\SDL_Image.dll'; {$ENDIF} {$IFDEF UNIX} diff --git a/Game/Code/lib/JEDI-SDL/SDL_ttf/Pas/sdl_ttf.pas b/Game/Code/lib/JEDI-SDL/SDL_ttf/Pas/sdl_ttf.pas index 88966f82..73001038 100644 --- a/Game/Code/lib/JEDI-SDL/SDL_ttf/Pas/sdl_ttf.pas +++ b/Game/Code/lib/JEDI-SDL/SDL_ttf/Pas/sdl_ttf.pas @@ -179,7 +179,7 @@ uses const {$IFDEF WINDOWS} - SDLttfLibName = 'SDL_ttf.dll'; + SDLttfLibName = 'Libraries\SDL_ttf.dll'; {$ENDIF} {$IFDEF UNIX} diff --git a/Game/Code/lib/SQLite/SQLite3.pas b/Game/Code/lib/SQLite/SQLite3.pas index f1b03e08..202aa401 100644 --- a/Game/Code/lib/SQLite/SQLite3.pas +++ b/Game/Code/lib/SQLite/SQLite3.pas @@ -15,7 +15,7 @@ interface const {$IFDEF MSWINDOWS} - SQLiteDLL = 'sqlite3.dll'; + SQLiteDLL = 'Libraries\sqlite3.dll'; {$ENDIF} {$IFDEF LINUX} SQLiteDLL = 'sqlite3.so'; diff --git a/Game/Code/lib/bass/delphi/bass.pas b/Game/Code/lib/bass/delphi/bass.pas index ba661699..0339e5a3 100644 --- a/Game/Code/lib/bass/delphi/bass.pas +++ b/Game/Code/lib/bass/delphi/bass.pas @@ -771,7 +771,7 @@ type // Functions const - bassdll = 'bass.dll'; + bassdll = 'Libraries\bass.dll'; function BASS_SetConfig(option, value: DWORD): DWORD; stdcall; external bassdll; function BASS_GetConfig(option: DWORD): DWORD; stdcall; external bassdll; diff --git a/Game/Code/lib/libpng/png.pas b/Game/Code/lib/libpng/png.pas index 0d784140..3d700104 100644 --- a/Game/Code/lib/libpng/png.pas +++ b/Game/Code/lib/libpng/png.pas @@ -29,7 +29,7 @@ uses const {$ifdef MSWINDOWS} // use libpng12-0 (Version 1.2.18), delivered wih SDL_Image - LibPng = 'libpng12-0'; // 'libpng13'; + LibPng = 'Libraries\libpng12-0'; // 'libpng13'; // matching lib version for libpng13.dll, needed for initialization PNG_LIBPNG_VER_STRING='1.2.12'; // define the compiler that was used to built the DLL (necessary for jmp_buf) diff --git a/Game/Code/lib/projectM/0.9/projectM.pas b/Game/Code/lib/projectM/0.9/projectM.pas index 609448fd..cf98150e 100644 --- a/Game/Code/lib/projectM/0.9/projectM.pas +++ b/Game/Code/lib/projectM/0.9/projectM.pas @@ -16,7 +16,7 @@ uses const {$IFDEF win32} - libprojectM = 'libprojectM.dll'; + libprojectM = 'Libraries\libprojectM'; {$ELSE} libprojectM = 'libprojectM.so'; {$ENDIF} diff --git a/Game/Code/lib/projectM/1.0/projectM.pas b/Game/Code/lib/projectM/1.0/projectM.pas index 47da36cc..c16873af 100644 --- a/Game/Code/lib/projectM/1.0/projectM.pas +++ b/Game/Code/lib/projectM/1.0/projectM.pas @@ -16,7 +16,7 @@ uses const {$IFDEF win32} - libprojectM = 'projectM-cwrapper.dll'; + libprojectM = 'Libraries\projectM-cwrapper.dll'; {$ELSE} libprojectM = 'libprojectM-cwrapper.so'; {$ENDIF} -- cgit v1.2.3