X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=win32gl%2Fpackage%2Ftrunk%2FCB12.11%2FProgram%20Files%2FCodeblocks%2Fshare%2FCodeBlocks%2Ftemplates%2Fwizard%2FPsychlopsGL%2Fwizard.script;fp=win32gl%2Fpackage%2Ftrunk%2FCB12.11%2FProgram%20Files%2FCodeblocks%2Fshare%2FCodeBlocks%2Ftemplates%2Fwizard%2FPsychlopsGL%2Fwizard.script;h=aff45ce2893eb3c8868b7467141db7ba7343c34e;hb=027a6c9c0b8bc066ae5494a0ca1689ab2a767a61;hp=b42ac90ef3631217b00b958b1fd3e10209fa7e64;hpb=06c3c01470b14e12023c2583f9df049069a3b432;p=psychlops%2Fcpp.git

diff --git a/win32gl/package/trunk/CB12.11/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script b/win32gl/package/trunk/CB12.11/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
index b42ac90..aff45ce 100644
--- a/win32gl/package/trunk/CB12.11/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script	
+++ b/win32gl/package/trunk/CB12.11/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script	
@@ -32,11 +32,11 @@ function SetupProject(project)
         project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\Lib"));
         project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\Lib\\extension"));
         project.AddIncludeDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\include"));
-        project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\mingw4"));
 
         // add link libraries
         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("libpng_mingw.a"));
             project.AddLinkLib(_T("libfftw3.a"));
@@ -69,12 +69,32 @@ function SetupProject(project)
         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"));
+            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_ml249.lib"));
+            project.AddLinkLib(_T("opencv_nonfree249.lib"));
+            project.AddLinkLib(_T("opencv_objdetect249.lib"));
+            project.AddLinkLib(_T("opencv_ocl249.lib"));
+            project.AddLinkLib(_T("opencv_photo249.lib"));
+            project.AddLinkLib(_T("opencv_stitching249.lib"));
+            project.AddLinkLib(_T("opencv_superres249.lib"));
+            project.AddLinkLib(_T("opencv_video249.lib"));
+            project.AddLinkLib(_T("opencv_videostab249.lib"));
         }
         else if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("bcc")))
         {