2.0.0

diff --git a/psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge_dummy.cpp b/psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge_dummy.cpp
new file mode 100644 (file)
index 0000000..1d1720e
--- /dev/null
+++ b/psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge_dummy.cpp
@@ -0,0 +1,36 @@
+/*
+ *  psychlops_g_PNG_bridge.cpp
+ *  Psychlops Standard Library (Universal)
+ *
+ *  Last Modified 2006/08/22 by Kenchi HOSOKAWA
+ *  (C) 2006- Kenchi HOSOKAWA, Kazushi MARUYA and Takao SATO
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "../../../core/ApplicationInterfaces/psychlops_code_exception.h"
+#include "../../../core/graphic/psychlops_g_image.h"
+#include "psychlops_g_OPENCV_bridge.h"
+
+
+namespace Psychlops {
+namespace IMAGE_FORMATS {
+
+
+       OPENCV_BRIDGE::OPENCV_BRIDGE() {
+       }
+       OPENCV_BRIDGE::~OPENCV_BRIDGE() {
+       }
+
+
+       void OPENCV_BRIDGE::load(const char *file_name, Image * target) {\r
+               std::cout << "The compiler did not support OpenCV2." << std::endl;
+       }
+       void OPENCV_BRIDGE::save(const char *file_name, Image * target) {\r
+               std::cout << "The compiler did not support OpenCV2." << std::endl;
+       }
+
+
+}
+}

diff --git a/psychlops/extension/standard/cv/psychlops_cv1_bridge_dummy.cpp b/psychlops/extension/standard/cv/psychlops_cv1_bridge_dummy.cpp
new file mode 100644 (file)
index 0000000..c4b0097
--- /dev/null
+++ b/psychlops/extension/standard/cv/psychlops_cv1_bridge_dummy.cpp
@@ -0,0 +1,15 @@
+/*\r
+ *  psychlops_FFTW_bridge.cpp\r
+ *  Psychlops Standard Library (Universal)\r
+ *\r
+ *  Last Modified 2010/03/05 by Kenchi HOSOKAWA\r
+ *  (C) 2010 Kenchi HOSOKAWA, Kazushi MARUYA, Takao SATO\r
+ */\r
+\r
+\r
+#include "../../../psychlops_core.h"\r
+#include "psychlops_cv1_bridge.h"\r
+\r
+\r
+namespace Psychlops {\r
+}      /*      <- namespace Psycholops         */\r

diff --git a/psychlops/extension/standard/cv/psychlops_cv2_bridge_dummy.cpp b/psychlops/extension/standard/cv/psychlops_cv2_bridge_dummy.cpp
new file mode 100644 (file)
index 0000000..1d86caa
--- /dev/null
+++ b/psychlops/extension/standard/cv/psychlops_cv2_bridge_dummy.cpp
@@ -0,0 +1,68 @@
+/*\r
+ *  psychlops_FFTW_bridge.cpp\r
+ *  Psychlops Standard Library (Universal)\r
+ *\r
+ *  Last Modified 2010/03/05 by Kenchi HOSOKAWA\r
+ *  (C) 2010 Kenchi HOSOKAWA, Kazushi MARUYA, Takao SATO\r
+ */\r
+\r
+\r
+#include "../../../psychlops_core.h"\r
+#include "psychlops_cv2_bridge.h"\r
+\r
+\r
+//AppState::ImageByteAlignment = 4;\r
+\r
+namespace Psychlops {\r
+\r
+void Matrix::from(const cv::Mat &target)\r
+{\r
+       std::cout << "The compiler did not support OpenCV2." << std::endl;\r
+}\r
+void Matrix::convertFromCvMat(Matrix &gray, const cv::Mat &target)\r
+{\r
+       std::cout << "The compiler did not support OpenCV2." << std::endl;\r
+}\r
+void Matrix::convertFromCvMat(Matrix &r, Matrix &g, Matrix &b, const cv::Mat &target)\r
+{\r
+       std::cout << "The compiler did not support OpenCV2." << std::endl;\r
+}\r
+void Matrix::convertFromCvMat(Matrix &r, Matrix &g, Matrix &b, Matrix &a, const cv::Mat &target)\r
+{\r
+       std::cout << "The compiler did not support OpenCV2." << std::endl;\r
+}\r
+
+void Matrix::to(cv::Mat &target) const\r
+{\r
+       std::cout << "The compiler did not support OpenCV2." << std::endl;\r
+}
+\r
+void Matrix::convertToCvMat(const Matrix &gray, cv::Mat &target)\r
+{\r
+       std::cout << "The compiler did not support OpenCV2." << std::endl;\r
+}\r
+\r
+void Matrix::convertToCvMat(const Matrix &r, const Matrix &g, const Matrix &b, cv::Mat &target)\r
+{\r
+       std::cout << "The compiler did not support OpenCV2." << std::endl;\r
+}\r
+\r
+void Matrix::convertToCvMat(const Matrix &r, const Matrix &g, const Matrix &b, const Matrix &a, cv::Mat &target)\r
+{\r
+       std::cout << "The compiler did not support OpenCV2." << std::endl;\r
+}\r
+\r
+
+void Image::to(cv::Mat &target) const\r
+{\r
+       std::cout << "The compiler did not support OpenCV2." << std::endl;\r
+}\r
+\r
+\r
+void Image::from(cv::Mat &source)\r
+{\r
+       std::cout << "The compiler did not support OpenCV2." << std::endl;\r
+}\r
+\r
+\r
+}      /*      <- namespace Psycholops         */\r

diff --git a/psychlops/platform/cv/psychlops_misc_opencv_dummy.cpp b/psychlops/platform/cv/psychlops_misc_opencv_dummy.cpp
new file mode 100644 (file)
index 0000000..0af47c1
--- /dev/null
+++ b/psychlops/platform/cv/psychlops_misc_opencv_dummy.cpp
@@ -0,0 +1,21 @@
+/*
+ *  psychlops_widgets_Win32GL.cpp
+ *  Psychlops Standard Library (Universal)
+ *
+ *  Last Modified 2009/12/14 by Kenchi HOSOKAWA
+ *  (C) 2009 Kenchi HOSOKAWA, Kazushi MARUYA and Takao SATO
+ */
+
+\r
+#include "../../extension/standard/figure/psychlops_figure_standard.h"\r
+\r
+
+namespace Psychlops {\r
+\r
+       Figures::Movie& Figures::Movie::save(std::string filename, const double t_fps, const FOURCC codec) {\r
+               std::cout << "The compiler did not support OpenCV2." << std::endl;
+               return *this;\r
+       }\r
+\r
+
+}      /*      <- namespace Psycholops         */\r

diff --git a/win32gl/dev/psychlopswin32.cbp b/win32gl/dev/psychlopswin32.cbp
index 90ac7b7..b690a3e 100644 (file)
--- a/win32gl/dev/psychlopswin32.cbp
+++ b/win32gl/dev/psychlopswin32.cbp
@@ -62,7 +62,7 @@
                                </Linker>
                        </Target>
                        <Target title="MinGW4">
-                               <Option output="libpsychlopswin32gcc.a" prefix_auto="0" extension_auto="0" />
+                               <Option output="libpsychlopswin32gcc4.a" prefix_auto="0" extension_auto="0" />
                                <Option working_dir="" />
                                <Option object_output=".objs_mingw4" />
                                <Option deps_output=".deps_mingw" />
@@ -337,8 +337,20 @@
                <Unit filename="../../psychlops/extension/FileFormat/JPEG/jpeglib.h" />
                <Unit filename="../../psychlops/extension/FileFormat/JPEG/psychlops_g_JPEG_bridge.cpp" />
                <Unit filename="../../psychlops/extension/FileFormat/JPEG/psychlops_g_JPEG_bridge.h" />
-               <Unit filename="../../psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge.cpp" />
+               <Unit filename="../../psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge.cpp">
+                       <Option target="MinGW4" />
+                       <Option target="VC10" />
+                       <Option target="VC12" />
+                       <Option target="VC9x64" />
+                       <Option target="MinGW Devices" />
+                       <Option target="VC9 Devices" />
+               </Unit>
                <Unit filename="../../psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge.h" />
+               <Unit filename="../../psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge_dummy.cpp">
+                       <Option target="BCC5.51" />
+                       <Option target="MinGW" />
+                       <Option target="VC9" />
+               </Unit>
                <Unit filename="../../psychlops/extension/FileFormat/PNG/png.h" />
                <Unit filename="../../psychlops/extension/FileFormat/PNG/pngconf.h" />
                <Unit filename="../../psychlops/extension/FileFormat/PNG/psychlops_g_PNG_bridge.cpp" />
@@ -377,8 +389,25 @@
                <Unit filename="../../psychlops/extension/psychlops_prototype.h" />
                <Unit filename="../../psychlops/extension/standard/cv/psychlops_cv1_bridge.cpp" />
                <Unit filename="../../psychlops/extension/standard/cv/psychlops_cv1_bridge.h" />
-               <Unit filename="../../psychlops/extension/standard/cv/psychlops_cv2_bridge.cpp" />
+               <Unit filename="../../psychlops/extension/standard/cv/psychlops_cv1_bridge_dummy.cpp">
+                       <Option target="BCC5.51" />
+                       <Option target="MinGW" />
+                       <Option target="VC9" />
+               </Unit>
+               <Unit filename="../../psychlops/extension/standard/cv/psychlops_cv2_bridge.cpp">
+                       <Option target="MinGW4" />
+                       <Option target="VC10" />
+                       <Option target="VC12" />
+                       <Option target="VC9x64" />
+                       <Option target="MinGW Devices" />
+                       <Option target="VC9 Devices" />
+               </Unit>
                <Unit filename="../../psychlops/extension/standard/cv/psychlops_cv2_bridge.h" />
+               <Unit filename="../../psychlops/extension/standard/cv/psychlops_cv2_bridge_dummy.cpp">
+                       <Option target="BCC5.51" />
+                       <Option target="MinGW" />
+                       <Option target="VC9" />
+               </Unit>
                <Unit filename="../../psychlops/extension/standard/fft/fftw3.h" />
                <Unit filename="../../psychlops/extension/standard/fft/psychlops_FFTW_bridge.cpp" />
                <Unit filename="../../psychlops/extension/standard/fft/psychlops_FFTW_bridge.h" />
@@ -404,7 +433,19 @@
                <Unit filename="../../psychlops/extension/standard/widgets/psychlops_widgets_event.h" />
                <Unit filename="../../psychlops/extension/standard/widgets/psychlops_widgets_prototype.cpp" />
                <Unit filename="../../psychlops/extension/standard/widgets/psychlops_widgets_prototype.h" />
-               <Unit filename="../../psychlops/platform/cv/psychlops_misc_opencv.cpp" />
+               <Unit filename="../../psychlops/platform/cv/psychlops_misc_opencv.cpp">
+                       <Option target="MinGW4" />
+                       <Option target="VC10" />
+                       <Option target="VC12" />
+                       <Option target="VC9x64" />
+                       <Option target="MinGW Devices" />
+                       <Option target="VC9 Devices" />
+               </Unit>
+               <Unit filename="../../psychlops/platform/cv/psychlops_misc_opencv_dummy.cpp">
+                       <Option target="MinGW" />
+                       <Option target="VC9" />
+                       <Option target="BCC5.51" />
+               </Unit>
                <Unit filename="../../psychlops/platform/gl/extension/psychlops_g_shader_gl.cpp" />
                <Unit filename="../../psychlops/platform/gl/extension/psychlops_g_shader_gl.h" />
                <Unit filename="../../psychlops/platform/gl/psychlops_g_GL_h.h" />

diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2
index b3c623f..9554393 100644 (file)
--- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2
+++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2
@@ -1,14 +1,14 @@
 [Project]\r
 ProjectName=Psychlops Framework Win32\r
 CreateFileName=PsychlopsFramework_Win32_CB10_%VER_MAJOR%.%VER_MINOR%.%VER_RELEASE%\r
-CreateFolder=D:\Users\hskwk\Documents\Develop\Psychlops\cpp\trunk\win32gl\package\trunk\@EasyInstaller\PsychlopsInstaller\r
+CreateFolder=D:\Users\hskwk\Documents\Develop\Psychlops\cpp\\master\win32gl\package\trunk\@EasyInstaller\PsychlopsInstaller\r
 UseUniqueKey=0\r
 InstallerModuleName=EI_MODERN\r
 InstallerModuleLanguage=1041\r
 MajorVersion=4\r
 MinorVersion=1\r
 CreateDateTime=2005/12/22 15:09:29\r
-UpdateDateTime=2015/04/02 23:10:19\r
+UpdateDateTime=2015/04/03 14:20:07\r
 Generator=EINSTALL 2.0\r
 CreateFileType=4\r
 CreateFileAddVersionInfo=1\r

diff --git a/win32gl/package/trunk/CB10.05/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script b/win32gl/package/trunk/CB10.05/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
index ac5717e..94082c2 100644 (file)
--- a/win32gl/package/trunk/CB10.05/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
+++ b/win32gl/package/trunk/CB10.05/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
@@ -35,29 +35,9 @@ function SetupProject(project)
         // 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"));
-            project.AddLinkLib(_T("libopencv_calib3d249.dll.a"));
-            project.AddLinkLib(_T("libopencv_contrib249.dll.a"));
-            project.AddLinkLib(_T("libopencv_core249.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("libopencv_ml249.dll.a"));
-            project.AddLinkLib(_T("libopencv_nonfree249.dll.a"));
-            project.AddLinkLib(_T("libopencv_objdetect249.dll.a"));
-            project.AddLinkLib(_T("libopencv_ocl249.dll.a"));
-            project.AddLinkLib(_T("libopencv_photo249.dll.a"));
-            project.AddLinkLib(_T("libopencv_stitching249.dll.a"));
-            project.AddLinkLib(_T("libopencv_superres249.dll.a"));
-            project.AddLinkLib(_T("libopencv_video249.dll.a"));
-            project.AddLinkLib(_T("libopencv_videostab249.dll.a"));
         }
         project.AddLinkLib(_T("kernel32"));
         project.AddLinkLib(_T("opengl32"));
@@ -68,32 +48,12 @@ 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")))
         {

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 aff45ce..f359481 100644 (file)
--- 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
@@ -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"));
@@ -69,20 +68,18 @@ 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"));
+        }
+        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 +93,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

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 (file)
--- 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

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 (file)
--- 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

diff --git a/win32gl/package/trunk/CB13.12woCV/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script b/win32gl/package/trunk/CB13.12woCV/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
index 94082c2..cdc931b 100644 (file)
--- a/win32gl/package/trunk/CB13.12woCV/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
+++ b/win32gl/package/trunk/CB13.12woCV/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

diff --git a/win32gl/package/trunk/CB8.02/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script b/win32gl/package/trunk/CB8.02/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
index fd2adef..5e4127b 100644 (file)
--- a/win32gl/package/trunk/CB8.02/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
+++ b/win32gl/package/trunk/CB8.02/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
@@ -35,29 +35,9 @@ function SetupProject(project)
         // 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"));
-            project.AddLinkLib(_T("libopencv_calib3d249.dll.a"));
-            project.AddLinkLib(_T("libopencv_contrib249.dll.a"));
-            project.AddLinkLib(_T("libopencv_core249.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("libopencv_ml249.dll.a"));
-            project.AddLinkLib(_T("libopencv_nonfree249.dll.a"));
-            project.AddLinkLib(_T("libopencv_objdetect249.dll.a"));
-            project.AddLinkLib(_T("libopencv_ocl249.dll.a"));
-            project.AddLinkLib(_T("libopencv_photo249.dll.a"));
-            project.AddLinkLib(_T("libopencv_stitching249.dll.a"));
-            project.AddLinkLib(_T("libopencv_superres249.dll.a"));
-            project.AddLinkLib(_T("libopencv_video249.dll.a"));
-            project.AddLinkLib(_T("libopencv_videostab249.dll.a"));
         }
         project.AddLinkLib(_T("kernel32"));
         project.AddLinkLib(_T("opengl32"));
@@ -68,32 +48,12 @@ function SetupProject(project)
         project.AddLinkLib(_T("comdlg32"));
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc*")))
         {
-            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")))
         {

diff --git a/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/Readme.txt b/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/Readme.txt
index 2db7d2b..aa47cea 100644 (file)
--- a/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/Readme.txt
+++ b/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/Readme.txt
@@ -1,6 +1,6 @@
 Psychlops framework Win32 OpenGL\r
 \r
-version: 1.7.0\r
+version: 2.0.0 / 1.7.0\r
 build:   20150401\r
 \r
 \r

diff --git a/win32gl/package/trunk/copyfiles.bat b/win32gl/package/trunk/copyfiles.bat
index 38ebbb0..877acb2 100644 (file)
--- a/win32gl/package/trunk/copyfiles.bat
+++ b/win32gl/package/trunk/copyfiles.bat
@@ -10,6 +10,6 @@ ROBOCOPY %1 .\Library\Frameworks\Psychlops.framework\Lib *.lib /LOG:copylog.txt
 ROBOCOPY %1 .\Library\Frameworks\Psychlops.framework\Lib *.a /LOG+:copylog.txt\r
 ROBOCOPY %1 .\Library\Frameworks\Psychlops.framework\Headers *.h /S /PURGE /LOG+:copylog.txt /XD .svn\r
 )\r
-move .\Library\Frameworks\Psychlops.framework\Lib\libpsychlopswin32gcc3.a .\CB10.05\Psychlops.framework\Lib\libpsychlopswin32gcc.a\r
-move .\Library\Frameworks\Psychlops.framework\Lib\psychlopswin32vc10.lib .\VC10\Library\Frameworks\Psychlops.framework\Lib\psychlopswin32vc10.a\r
+copy .\Library\Frameworks\Psychlops.framework\Lib\libpsychlopswin32gcc3.a .\Library\Frameworks\Psychlops.framework\Lib\libpsychlopswin32gcc.a\r
+rem move .\Library\Frameworks\Psychlops.framework\Lib\psychlopswin32vc10.lib .\VC10\Library\Frameworks\Psychlops.framework\Lib\psychlopswin32vc10.a\r
 pause\r

diff --git a/win32gl/test/Psychlops_win32cblibtest.cbp b/win32gl/test/Psychlops_win32cblibtest.cbp
index 9001b10..45cc7ab 100644 (file)
--- a/win32gl/test/Psychlops_win32cblibtest.cbp
+++ b/win32gl/test/Psychlops_win32cblibtest.cbp
@@ -46,7 +46,7 @@
                                </Compiler>
                                <Linker>
                                        <Add option="-s" />
-                                       <Add library="..\dev\libpsychlopswin32gcc.a" />
+                                       <Add library="..\dev\libpsychlopswin32gcc4.a" />
                                        <Add library="lib\libpng_mingw.a" />
                                        <Add library="lib\libfftw3.a" />
                                        <Add library="opengl32" />

diff --git a/win32gl/test/compilenew.cpp b/win32gl/test/compilenew.cpp
index c1ae204..28faba3 100644 (file)
--- a/win32gl/test/compilenew.cpp
+++ b/win32gl/test/compilenew.cpp
@@ -34,6 +34,7 @@ void psychlops_main() {
                //      rs = CreateProcess("C:\\Windows\\System32\\print.exe",(LPTSTR)" /D:LPT1 D:\\Users\\hskwk\\Desktop\\zzz.txt",NULL,NULL,FALSE,NORMAL_PRIORITY_CLASS,NULL,NULL,&si,&pi);\r
 \r
                if(t%120==0) trigger.trigger();\r
+               rect.draw();\r
 \r
                Display::flip(); // Flip frame buffers\r
        }\r