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

diff --git a/win32gl/package/trunk/CB12.11woCV/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script b/win32gl/package/trunk/CB12.11woCV/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
index 94082c2..cdc931b 100644
--- a/win32gl/package/trunk/CB12.11woCV/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script	
+++ b/win32gl/package/trunk/CB12.11woCV/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
@@ -35,7 +35,7 @@ function SetupProject(project)
         // add link libraries
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("gcc")))
         {
-            project.AddLinkLib(_T("libpsychlopswin32gcc.a"));
+            project.AddLinkLib(_T("libpsychlopswin32gcc4.a"));
             project.AddLinkLib(_T("libpng_mingw.a"));
             project.AddLinkLib(_T("libfftw3.a"));
         }
@@ -55,14 +55,14 @@ function SetupProject(project)
             project.AddCompilerOption(_T("/EHs"));
             project.AddCompilerOption(_T("/GA"));
         }
-        else if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("bcc")))
+        if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc10")))
         {
-            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("psychlopswin32vc10.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"));
         }
     }
     else