diff --git a/src/RageFileDriverDeflate.cpp b/src/RageFileDriverDeflate.cpp index 6906a6eb5b..35738eea27 100644 --- a/src/RageFileDriverDeflate.cpp +++ b/src/RageFileDriverDeflate.cpp @@ -7,9 +7,9 @@ #include #if defined(_WINDOWS) - #include "../extern/zlib/zlib.h" + #include "zlib.h" #if defined(_MSC_VER) - #pragma comment(lib, "../extern/zlib/zdll.lib") + #pragma comment(lib, "zdll.lib") #endif #elif defined(MACOSX) /* Since crypto++ was added to the repository, includes the zlib.h diff --git a/src/RageSoundReader_MP3.cpp b/src/RageSoundReader_MP3.cpp index c23bda8a9e..048b20e508 100644 --- a/src/RageSoundReader_MP3.cpp +++ b/src/RageSoundReader_MP3.cpp @@ -12,7 +12,7 @@ #if defined(_WINDOWS) || defined(MACOSX) #include "../extern/mad-0.15.1b/mad.h" #ifdef _MSC_VER -#pragma comment(lib, "../extern/mad-0.15.1b/msvc++/Release/libmad.lib") +#pragma comment(lib, "libmad.lib") #endif //_MSC_VER #else #include diff --git a/src/RageSurface_Load_JPEG.cpp b/src/RageSurface_Load_JPEG.cpp index 2ffeca29da..0fdfa279fb 100644 --- a/src/RageSurface_Load_JPEG.cpp +++ b/src/RageSurface_Load_JPEG.cpp @@ -11,11 +11,11 @@ // work around namespace bugs in win32/libjpeg: #define XMD_H #undef FAR -#include "../extern/libjpeg/jpeglib.h" -#include "../extern/libjpeg/jerror.h" +#include "jpeglib.h" +#include "jerror.h" #if defined(_MSC_VER) -#pragma comment(lib, "../extern/libjpeg/jpeg.lib") +#pragma comment(lib, "jpeg.lib") #endif #pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */ diff --git a/src/RageSurface_Load_PNG.cpp b/src/RageSurface_Load_PNG.cpp index 875920f8d4..e5d37e5818 100644 --- a/src/RageSurface_Load_PNG.cpp +++ b/src/RageSurface_Load_PNG.cpp @@ -7,9 +7,9 @@ #if defined(_WINDOWS) -# include "../extern/libpng/include/png.h" +# include "png.h" # if defined(_MSC_VER) -# pragma comment(lib, "../extern/libpng/lib/libpng.lib") +# pragma comment(lib, "libpng.lib") # pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */ # endif // _MSC_VER #else diff --git a/src/RageSurface_Save_JPEG.cpp b/src/RageSurface_Save_JPEG.cpp index 8954b5a16d..14277ab4e4 100644 --- a/src/RageSurface_Save_JPEG.cpp +++ b/src/RageSurface_Save_JPEG.cpp @@ -18,7 +18,7 @@ namespace jpeg // Pull in JPEG library here. #if defined _MSC_VER -#pragma comment(lib, "../extern/libjpeg/jpeg.lib") +#pragma comment(lib, "jpeg.lib") #endif #define OUTPUT_BUFFER_SIZE 4096 diff --git a/src/RageSurface_Save_PNG.cpp b/src/RageSurface_Save_PNG.cpp index e94101dece..bd567b0366 100644 --- a/src/RageSurface_Save_PNG.cpp +++ b/src/RageSurface_Save_PNG.cpp @@ -7,9 +7,9 @@ #include "RageUtil.h" #if defined(WINDOWS) -#include "../extern/libpng/include/png.h" +#include "png.h" #if defined(_MSC_VER) -# pragma comment(lib, "../extern/libpng/lib/libpng.lib") +# pragma comment(lib, "libpng.lib") #pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */ #endif #else diff --git a/src/StepMania-net2003.vcproj b/src/StepMania-net2003.vcproj index 734b021f7b..8b30f45de3 100644 --- a/src/StepMania-net2003.vcproj +++ b/src/StepMania-net2003.vcproj @@ -25,7 +25,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHa" Optimization="0" - AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" + AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC" ExceptionHandling="FALSE" BasicRuntimeChecks="3" @@ -51,7 +51,7 @@ OutputFile="../Program/StepMania-debug.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" + AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\"" IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(IntDir)/StepMania.pdb" @@ -110,7 +110,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ FavorSizeOrSpeed="2" OptimizeForProcessor="2" OptimizeForWindowsApplication="TRUE" - AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" + AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC" StringPooling="TRUE" MinimalRebuild="FALSE" @@ -140,7 +140,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ OutputFile="../Program/StepMania.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" + AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\"" IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib" ProgramDatabaseFile="$(IntDir)/StepMania.pdb" GenerateMapFile="TRUE" @@ -192,7 +192,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ Name="VCCLCompilerTool" AdditionalOptions="/EHa" Optimization="0" - AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" + AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;..\extern\jsoncpp\include;"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis" PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC" ExceptionHandling="FALSE" BasicRuntimeChecks="0" @@ -218,7 +218,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ OutputFile="..\Program\StepMania-fastdebug.exe" LinkIncremental="2" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" + AdditionalLibraryDirectories="ffmpeg\lib;..\extern\libpng\lib\;..\extern\libjpeg\;..\extern\zlib\;"..\extern\mad-0.15.1b\msvc++\Release\"" IgnoreDefaultLibraryNames="wininet.lib;msimg32.lib;libci.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(IntDir)/StepMania.pdb" diff --git a/src/StepMania-net2005.vcproj b/src/StepMania-net2005.vcproj index a7a5636a7b..074740c3a7 100644 --- a/src/StepMania-net2005.vcproj +++ b/src/StepMania-net2005.vcproj @@ -49,7 +49,7 @@ shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;ffmpeg/modern_working/lib/avcodec.lib;ffmpeg/modern_working/lib/avformat.lib;ffmpeg/modern_working/lib/avutil.lib;ffmpeg/modern_working/lib/swscale.lib;%(AdditionalDependencies) ../Program/StepMania-debug.exe true - ffmpeg\lib;%(AdditionalLibraryDirectories) + ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true $(IntDir)StepMania.pdb @@ -203,7 +203,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;ffmpeg/modern_working/lib/avcodec.lib;ffmpeg/modern_working/lib/avformat.lib;ffmpeg/modern_working/lib/avutil.lib;ffmpeg/modern_working/lib/swscale.lib;%(AdditionalDependencies) ../Program/StepMania.exe true - ffmpeg\lib;%(AdditionalLibraryDirectories) + ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;%(IgnoreSpecificDefaultLibraries) $(IntDir)StepMania.pdb true @@ -262,7 +262,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;ffmpeg/modern_working/lib/avcodec.lib;ffmpeg/lib/avformat.lib;ffmpeg/lib/avutil.lib;ffmpeg/lib/swscale.lib;%(AdditionalDependencies) ../Program/StepMania-fastdebug.exe true - ffmpeg\lib;%(AdditionalLibraryDirectories) + ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries) true $(IntDir)StepMania.pdb @@ -329,7 +329,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ shell32.lib;gdi32.lib;user32.lib;ole32.lib;advapi32.lib;ffmpeg/modern_working/lib/avcodec.lib;ffmpeg/modern_working/lib/avformat.lib;ffmpeg/modern_working/lib/avutil.lib;ffmpeg/modern_working/lib/swscale.lib;%(AdditionalDependencies) ..\Program/StepMania-SSE2.exe true - ffmpeg\lib;%(AdditionalLibraryDirectories) + ffmpeg\lib;..\extern\libjpeg\;..\extern\zlib\;..\extern\mad-0.15.1b\msvc++\Release\%(AdditionalLibraryDirectories) wininet.lib;msimg32.lib;libci.lib;%(IgnoreSpecificDefaultLibraries) $(IntDir)StepMania-SSE2.pdb true