X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win32gl%2Fpackage%2Ftrunk%2FCB12.11%2FProgram%20Files%2FCodeblocks%2Fshare%2FCodeBlocks%2Ftemplates%2Fwizard%2FPsychlopsGL%2Fwizard.script;h=f359481dae1266fdc8e94936c85517787a9eb01c;hb=e77ebcd1edec379c18fefacdf9d91d140950f0a8;hp=b42ac90ef3631217b00b958b1fd3e10209fa7e64;hpb=29f119a6078d76e066a5b775c7669bced4013af1;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..f359481 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	
@@ -13,7 +13,7 @@ function BeginWizard()
 
     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
@@ -32,12 +32,12 @@ 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.AddLinkLib(_T("libpsychlopswin32gcc.a"));
+            project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\mingw4"));
+            project.AddLinkLib(_T("libpsychlopswin32gcc4.a"));
             project.AddLinkLib(_T("libpng_mingw.a"));
             project.AddLinkLib(_T("libfftw3.a"));
             project.AddLinkLib(_T("libopencv_calib3d249.dll.a"));
@@ -46,7 +46,6 @@ function SetupProject(project)
             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"));
@@ -70,21 +69,38 @@ function SetupProject(project)
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc8")))
         {
             project.AddLinkLib(_T("psychlopswin32vc9.lib"));
+        }
+        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_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"));
+        }
+        if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc*")))
+        {
             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 if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("bcc")))
-        {
-            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"));
-        }
     }
     else
     {