aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code
diff options
context:
space:
mode:
authorf1fth_freed0m <f1fth_freed0m@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-04-15 21:51:36 +0000
committerf1fth_freed0m <f1fth_freed0m@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-04-15 21:51:36 +0000
commitfece8a800270788455962ed4b99a023210daaaf9 (patch)
tree08ed1403ea8b3180870f251bb6dc3f24dbe0d918 /Game/Code
parent0e714a8189d8f0586f0e9520a8ae55d09b9c32e8 (diff)
downloadusdx-fece8a800270788455962ed4b99a023210daaaf9.tar.gz
usdx-fece8a800270788455962ed4b99a023210daaaf9.tar.xz
usdx-fece8a800270788455962ed4b99a023210daaaf9.zip
Removed Libraries Dir because of problems with some dlls
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1022 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code')
-rw-r--r--Game/Code/config-win.inc14
-rw-r--r--Game/Code/lib/JEDI-SDL/SDL/Pas/sdl.pas2
-rw-r--r--Game/Code/lib/JEDI-SDL/SDL_Image/Pas/sdl_image.pas2
-rw-r--r--Game/Code/lib/JEDI-SDL/SDL_ttf/Pas/sdl_ttf.pas2
-rw-r--r--Game/Code/lib/SQLite/SQLite3.pas2
-rw-r--r--Game/Code/lib/bass/delphi/bass.pas2
-rw-r--r--Game/Code/lib/libpng/png.pas2
-rw-r--r--Game/Code/lib/projectM/0.9/projectM.pas2
-rw-r--r--Game/Code/lib/projectM/1.0/projectM.pas2
9 files changed, 15 insertions, 15 deletions
diff --git a/Game/Code/config-win.inc b/Game/Code/config-win.inc
index 03f0414b..749575ec 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 = 'Libraries\avcodec-51';
+ av__codec = 'avcodec-51';
LIBAVCODEC_VERSION_MAJOR = 51;
LIBAVCODEC_VERSION_MINOR = 16;
LIBAVCODEC_VERSION_RELEASE = 0;
- av__format = 'Libraries\avformat-50';
+ av__format = 'avformat-50';
LIBAVFORMAT_VERSION_MAJOR = 50;
LIBAVFORMAT_VERSION_MINOR = 5;
LIBAVFORMAT_VERSION_RELEASE = 0;
- av__util = 'Libraries\avutil-49';
+ av__util = '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 = 'Libraries\swscale-0';
+ sw__scale = '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 = 'Libraries\libprojectM';
+ libprojectM = '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 = 'Libraries\portaudio_x86';
+ libportaudio = '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 = 'Libraries\portmixer';
+ libportmixer = '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 d2e30270..29bc7123 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 = 'Libraries\SDL.dll';
+ SDLLibName = '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 1013e322..d0699761 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 = 'Libraries\SDL_Image.dll';
+ SDL_ImageLibName = '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 73001038..88966f82 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 = 'Libraries\SDL_ttf.dll';
+ SDLttfLibName = 'SDL_ttf.dll';
{$ENDIF}
{$IFDEF UNIX}
diff --git a/Game/Code/lib/SQLite/SQLite3.pas b/Game/Code/lib/SQLite/SQLite3.pas
index 202aa401..f1b03e08 100644
--- a/Game/Code/lib/SQLite/SQLite3.pas
+++ b/Game/Code/lib/SQLite/SQLite3.pas
@@ -15,7 +15,7 @@ interface
const
{$IFDEF MSWINDOWS}
- SQLiteDLL = 'Libraries\sqlite3.dll';
+ SQLiteDLL = '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 0339e5a3..ba661699 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 = 'Libraries\bass.dll';
+ bassdll = '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 3d700104..0d784140 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 = 'Libraries\libpng12-0'; // 'libpng13';
+ LibPng = '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 cf98150e..5bf11061 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 = 'Libraries\libprojectM';
+ libprojectM = '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 c16873af..47da36cc 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 = 'Libraries\projectM-cwrapper.dll';
+ libprojectM = 'projectM-cwrapper.dll';
{$ELSE}
libprojectM = 'libprojectM-cwrapper.so';
{$ENDIF}