# HG changeset patch # User lbajardsilogic # Date 1198083173 0 # Node ID 8b41bf9a7c65e91044cbd43660098184bf3d4709 # Parent 216ae15d72a5f1fdae0dbda2d43a2eabb3d2f55f Static_Release link with qt static diff -r 216ae15d72a5 -r 8b41bf9a7c65 base/svbase.vcproj --- a/base/svbase.vcproj Tue Dec 18 16:11:16 2007 +0000 +++ b/base/svbase.vcproj Wed Dec 19 16:52:53 2007 +0000 @@ -198,10 +198,10 @@ AdditionalOptions="-Zm200 -EHsc" Optimization="2" AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include";.;..;"$(QTDIR)\include\ActiveQt";tmp_moc;"$(QTDIR)\mkspecs\win32-msvc2005"" - PreprocessorDefinitions="NDEBUG;BUILD_RELEASE;UNICODE;_UNICODE;_WINDOWS;QT_LARGEFILE_SUPPORT;WIN32;HAVE_BZ2;HAVE_PORTAUDIO;HAVE_PORTAUDIO_V18;HAVE_OGGZ;HAVE_FISHSOUND;HAVE_FFTW3F;HAVE_VAMP;HAVE_VAMP_HOSTSDK;HAVE_SNDFILE;HAVE_SAMPLERATE;HAVE_MAD;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_DLL;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;USE_VC;_USE_MATH_DEFINES" + PreprocessorDefinitions="NDEBUG;BUILD_RELEASE;UNICODE;_UNICODE;_WINDOWS;QT_LARGEFILE_SUPPORT;WIN32;HAVE_BZ2;HAVE_PORTAUDIO;HAVE_PORTAUDIO_V18;HAVE_OGGZ;HAVE_FISHSOUND;HAVE_FFTW3F;HAVE_VAMP;HAVE_VAMP_HOSTSDK;HAVE_SNDFILE;HAVE_SAMPLERATE;HAVE_MAD;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_NODLL;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;USE_VC;_USE_MATH_DEFINES" GeneratePreprocessedFile="0" MinimalRebuild="false" - RuntimeLibrary="2" + RuntimeLibrary="0" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" diff -r 216ae15d72a5 -r 8b41bf9a7c65 data/svdata.vcproj --- a/data/svdata.vcproj Tue Dec 18 16:11:16 2007 +0000 +++ b/data/svdata.vcproj Wed Dec 19 16:52:53 2007 +0000 @@ -198,10 +198,10 @@ AdditionalOptions="-Zm200 -EHsc" Optimization="2" AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtXml";"$(QTDIR)\include";.;fft;model;../sv;fileio;../sv/audioio;../sv/videoio;..;"$(QTDIR)\include\ActiveQt";tmp_moc;"$(QTDIR)\mkspecs\win32-msvc2005";"$(EASAIER_UTILS_DIR)\vamp-plugin-sdk\vamp-plugin-sdk-1.0";"$(EASAIER_UTILS_DIR)\libsndfile\libsndfile-1_0_16";"$(EASAIER_UTILS_DIR)\bzip2\bzip2-1.0.3";"$(EASAIER_UTILS_DIR)\libogg\libogg-1.1.3\include";"$(EASAIER_UTILS_DIR)\liboggz\liboggz-0.9.5\include";"$(EASAIER_UTILS_DIR)\libfishsound\libfishsound-0.7.0\include";"$(EASAIER_UTILS_DIR)\fftw3\fftw3.1.2";"$(EASAIER_UTILS_DIR)\libmad\libmad-0.15.1b";"$(EASAIER_UTILS_DIR)\ffmpeg\include";"$(EASAIER_UTILS_DIR)\SDL-1.2.12\include"" - PreprocessorDefinitions="NDEBUG;BUILD_RELEASE;UNICODE;_UNICODE;_WINDOWS;QT_LARGEFILE_SUPPORT;WIN32;HAVE_BZ2;HAVE_PORTAUDIO;HAVE_PORTAUDIO_V18;HAVE_OGGZ;HAVE_FISHSOUND;HAVE_FFTW3F;HAVE_VAMP;HAVE_VAMP_HOSTSDK;HAVE_SNDFILE;HAVE_SAMPLERATE;HAVE_MAD;HAVE_VIDEO;HAVE_FFMPEG;HAVE_SDL;SDL_FFMPEG_LIBRARY;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_DLL;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;USE_VC;_USE_MATH_DEFINES" + PreprocessorDefinitions="NDEBUG;BUILD_RELEASE;UNICODE;_UNICODE;_WINDOWS;QT_LARGEFILE_SUPPORT;WIN32;HAVE_BZ2;HAVE_PORTAUDIO;HAVE_PORTAUDIO_V18;HAVE_OGGZ;HAVE_FISHSOUND;HAVE_FFTW3F;HAVE_VAMP;HAVE_VAMP_HOSTSDK;HAVE_SNDFILE;HAVE_SAMPLERATE;HAVE_MAD;HAVE_VIDEO;HAVE_FFMPEG;HAVE_SDL;SDL_FFMPEG_LIBRARY;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_NODLL;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;USE_VC;_USE_MATH_DEFINES" GeneratePreprocessedFile="0" MinimalRebuild="false" - RuntimeLibrary="2" + RuntimeLibrary="0" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" diff -r 216ae15d72a5 -r 8b41bf9a7c65 layer/svlayer.vcproj --- a/layer/svlayer.vcproj Tue Dec 18 16:11:16 2007 +0000 +++ b/layer/svlayer.vcproj Wed Dec 19 16:52:53 2007 +0000 @@ -198,10 +198,10 @@ AdditionalOptions="-Zm200 -EHsc" Optimization="2" AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtXml";"$(QTDIR)\include";.;..;"$(QTDIR)\include\ActiveQt";tmp_moc;"$(QTDIR)\mkspecs\win32-msvc2005";"$(EASAIER_UTILS_DIR)\fftw3\fftw3.1.2"" - PreprocessorDefinitions="NDEBUG;BUILD_RELEASE;UNICODE;_UNICODE;_WINDOWS;QT_LARGEFILE_SUPPORT;WIN32;HAVE_BZ2;HAVE_PORTAUDIO;HAVE_PORTAUDIO_V18;HAVE_OGGZ;HAVE_FISHSOUND;HAVE_FFTW3F;HAVE_VAMP;HAVE_VAMP_HOSTSDK;HAVE_SNDFILE;HAVE_SAMPLERATE;HAVE_MAD;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_DLL;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;USE_VC;_USE_MATH_DEFINES" + PreprocessorDefinitions="NDEBUG;BUILD_RELEASE;UNICODE;_UNICODE;_WINDOWS;QT_LARGEFILE_SUPPORT;WIN32;HAVE_BZ2;HAVE_PORTAUDIO;HAVE_PORTAUDIO_V18;HAVE_OGGZ;HAVE_FISHSOUND;HAVE_FFTW3F;HAVE_VAMP;HAVE_VAMP_HOSTSDK;HAVE_SNDFILE;HAVE_SAMPLERATE;HAVE_MAD;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_NODLL;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;USE_VC;_USE_MATH_DEFINES" GeneratePreprocessedFile="0" MinimalRebuild="false" - RuntimeLibrary="2" + RuntimeLibrary="0" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" diff -r 216ae15d72a5 -r 8b41bf9a7c65 plugin/svplugin.vcproj --- a/plugin/svplugin.vcproj Tue Dec 18 16:11:16 2007 +0000 +++ b/plugin/svplugin.vcproj Wed Dec 19 16:52:53 2007 +0000 @@ -199,10 +199,10 @@ AdditionalOptions="-Zm200 -EHsc" Optimization="2" AdditionalIncludeDirectories=""$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\QtXml";"$(QTDIR)\include";.;..;api;api\alsa;plugins;api\alsa\sound;"$(QTDIR)\include\ActiveQt";tmp_moc;"$(QTDIR)\mkspecs\win32-msvc2005";"$(EASAIER_UTILS_DIR)\vamp-plugin-sdk\vamp-plugin-sdk-1.0";"$(EASAIER_UTILS_DIR)\libsndfile\libsndfile-1_0_16";"$(EASAIER_UTILS_DIR)\libsamplerate\libsamplerate-0.1.2\src"" - PreprocessorDefinitions="NDEBUG;BUILD_RELEASE;UNICODE;_UNICODE;_WINDOWS;QT_LARGEFILE_SUPPORT;WIN32;HAVE_BZ2;HAVE_PORTAUDIO;HAVE_PORTAUDIO_V18;HAVE_OGGZ;HAVE_FISHSOUND;HAVE_FFTW3F;HAVE_VAMP;HAVE_VAMP_HOSTSDK;HAVE_SNDFILE;HAVE_SAMPLERATE;HAVE_MAD;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_DLL;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;USE_VC;_USE_MATH_DEFINES" + PreprocessorDefinitions="NDEBUG;BUILD_RELEASE;UNICODE;_UNICODE;_WINDOWS;QT_LARGEFILE_SUPPORT;WIN32;HAVE_BZ2;HAVE_PORTAUDIO;HAVE_PORTAUDIO_V18;HAVE_OGGZ;HAVE_FISHSOUND;HAVE_FFTW3F;HAVE_VAMP;HAVE_VAMP_HOSTSDK;HAVE_SNDFILE;HAVE_SAMPLERATE;HAVE_MAD;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_NODLL;QT_XML_LIB;QT_GUI_LIB;QT_NETWORK_LIB;QT_CORE_LIB;USE_VC;_USE_MATH_DEFINES" GeneratePreprocessedFile="0" MinimalRebuild="false" - RuntimeLibrary="2" + RuntimeLibrary="0" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" diff -r 216ae15d72a5 -r 8b41bf9a7c65 sv/main/main.cpp --- a/sv/main/main.cpp Tue Dec 18 16:11:16 2007 +0000 +++ b/sv/main/main.cpp Wed Dec 19 16:52:53 2007 +0000 @@ -157,6 +157,10 @@ of the window. */ + +#ifdef QT_NODLL +#include +#endif static QMutex cleanupMutex; @@ -194,9 +198,14 @@ protected: MainWindow *m_mainWindow; }; + +#ifdef QT_NODLL +Q_IMPORT_PLUGIN(qjpeg) +Q_IMPORT_PLUGIN(qgif) +Q_IMPORT_PLUGIN(qmng) +#endif -int -main(int argc, char **argv) +int main(int argc, char **argv) { SVApplication application(argc, argv); diff -r 216ae15d72a5 -r 8b41bf9a7c65 sv/sound_access.vcproj --- a/sv/sound_access.vcproj Tue Dec 18 16:11:16 2007 +0000 +++ b/sv/sound_access.vcproj Wed Dec 19 16:52:53 2007 +0000 @@ -21,6 +21,7 @@ ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="0" >