Wizard.AddInfoPage(_T("PsychlopsIntro"), intro_msg);
Wizard.AddProjectPathPage();
- Wizard.AddCompilerPage(_T(""), _T("gcc;bcc*;msvc8"), true, true);
+ Wizard.AddCompilerPage(_T(""), _T("gcc;msvc8;msvc10"), true, true);
}
// return the files this project contains
if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("gcc")))
{
project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\mingw4"));
- project.AddLinkLib(_T("libpsychlopswin32gcc.a"));
+ project.AddLinkLib(_T("libpsychlopswin32gcc4.a"));
project.AddLinkLib(_T("libpng_mingw.a"));
project.AddLinkLib(_T("libfftw3.a"));
project.AddLinkLib(_T("libopencv_calib3d249.dll.a"));
project.AddLinkLib(_T("libopencv_features2d249.dll.a"));
project.AddLinkLib(_T("libopencv_flann249.dll.a"));
project.AddLinkLib(_T("libopencv_gpu249.dll.a"));
- project.AddLinkLib(_T("libopencv_haartraining_engine.a"));
project.AddLinkLib(_T("libopencv_highgui249.dll.a"));
project.AddLinkLib(_T("libopencv_imgproc249.dll.a"));
project.AddLinkLib(_T("libopencv_legacy249.dll.a"));
project.AddLinkLib(_T("advapi32"));
project.AddLinkLib(_T("user32"));
project.AddLinkLib(_T("comdlg32"));
+
if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc8")))
{
- project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\vc10"));
project.AddLinkLib(_T("psychlopswin32vc9.lib"));
- project.AddLinkLib(_T("libpng_vc9.lib"));
- project.AddLinkLib(_T("libfftw3_vc9.lib"));
- project.AddCompilerOption(_T("/GR"));
- project.AddCompilerOption(_T("/EHs"));
- project.AddCompilerOption(_T("/GA"));
+ }
+ if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc10")))
+ {
+ project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\vc10"));
+ project.AddLinkLib(_T("psychlopswin32vc10.lib"));
project.AddLinkLib(_T("opencv_calib3d249.lib"));
project.AddLinkLib(_T("opencv_contrib249.lib"));
project.AddLinkLib(_T("opencv_core249.lib"));
project.AddLinkLib(_T("opencv_features2d249.lib"));
project.AddLinkLib(_T("opencv_flann249.lib"));
project.AddLinkLib(_T("opencv_gpu249.lib"));
- project.AddLinkLib(_T("opencv_haartraining_engine.a"));
project.AddLinkLib(_T("opencv_highgui249.lib"));
project.AddLinkLib(_T("opencv_imgproc249.lib"));
project.AddLinkLib(_T("opencv_legacy249.lib"));
project.AddLinkLib(_T("opencv_video249.lib"));
project.AddLinkLib(_T("opencv_videostab249.lib"));
}
- else if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("bcc")))
+ if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc*")))
{
- project.AddLinkLib(_T("cw32mt.lib"));
- project.AddLinkLib(_T("import32.lib"));
- project.AddLinkLib(_T("psychlopswin32bcc.lib"));
- project.AddLinkLib(_T("libpng_bcc.lib"));
- project.AddCompilerOption(_T("-tW"));
- project.AddCompilerOption(_T("-tWM"));
+ project.AddLinkLib(_T("libpng_vc9.lib"));
+ project.AddLinkLib(_T("libfftw3_vc9.lib"));
+ project.AddCompilerOption(_T("/GR"));
+ project.AddCompilerOption(_T("/EHs"));
+ project.AddCompilerOption(_T("/GA"));
}
}
else