X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win32gl%2Fpackage%2Ftrunk%2FCB13.12%2FProgram%20Files%2FCodeblocks%2Fshare%2FCodeBlocks%2Ftemplates%2Fwizard%2FPsychlopsGL%2Fwizard.script;h=00d9eabc8c5a52aa045b8e2b898fdc4602125aba;hb=e77ebcd1edec379c18fefacdf9d91d140950f0a8;hp=aff45ce2893eb3c8868b7467141db7ba7343c34e;hpb=027a6c9c0b8bc066ae5494a0ca1689ab2a767a61;p=psychlops%2Fcpp.git

diff --git a/win32gl/package/trunk/CB13.12/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script b/win32gl/package/trunk/CB13.12/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
index aff45ce..00d9eab 100644
--- a/win32gl/package/trunk/CB13.12/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script	
+++ b/win32gl/package/trunk/CB13.12/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
@@ -37,7 +37,7 @@ function SetupProject(project)
         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"));
@@ -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"));
@@ -67,22 +66,21 @@ function SetupProject(project)
         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"));
@@ -96,14 +94,13 @@ function SetupProject(project)
             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