trigger

[psychlops/cpp.git] / win32gl / test / Psychlops_win32cblibtest.cbp

diff --git a/win32gl/test/Psychlops_win32cblibtest.cbp b/win32gl/test/Psychlops_win32cblibtest.cbp
index ad49533..9001b10 100644 (file)
--- a/win32gl/test/Psychlops_win32cblibtest.cbp
+++ b/win32gl/test/Psychlops_win32cblibtest.cbp
@@ -54,27 +54,25 @@
                                        <Add library="comdlg32" />
                                        <Add library="C:\Program Files\National Instruments\NI-DAQmx Base\Lib\nidaqmxbase.lib" />
                                        <Add library="C:\Program Files\National Instruments\NI-DAQ\DAQmx ANSI C Dev\lib\msvc\NIDAQmx.lib" />
-                                       <Add library="C:\Library\frameworks\opencv\build\x86\mingw\lib\libopencv_core249.dll.a" />
-                                       <Add library="C:\Library\frameworks\opencv\build\x86\mingw\lib\libopencv_highgui249.dll.a" />
-                                       <Add library="C:\Library\frameworks\opencv\build\x86\mingw\lib\libopencv_imgproc249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_calib3d249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_contrib249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_core249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_features2d249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_flann249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_gpu249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_highgui249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_imgproc249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_legacy249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_ml249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_nonfree249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_objdetect249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_ocl249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_photo249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_stitching249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_superres249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_video249.dll.a" />
-                                       <Add library="C:\Library\frameworks\Psychlops.framework\cv\lib\mingw\libopencv_videostab249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_calib3d249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_contrib249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_core249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_features2d249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_flann249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_gpu249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_haartraining_engine.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_highgui249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_imgproc249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_legacy249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_ml249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_nonfree249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_objdetect249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_ocl249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_photo249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_stitching249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_superres249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_video249.dll.a" />
+                                       <Add library="C:\Library\Frameworks\Psychlops.framework\cv\lib\mingw4\libopencv_videostab249.dll.a" />
                                </Linker>
                        </Target>
                        <Target title="BCC5.51">
@@ -186,10 +184,7 @@
                        <Option compile="0" />
                        <Option link="0" />
                </Unit>
-               <Unit filename="compilenew.cpp">
-                       <Option compile="0" />
-                       <Option link="0" />
-               </Unit>
+               <Unit filename="compilenew.cpp" />
                <Unit filename="fftfirm.cpp">
                        <Option compile="0" />
                        <Option link="0" />
@@ -206,7 +201,10 @@
                        <Option compile="0" />
                        <Option link="0" />
                </Unit>
-               <Unit filename="opencvtest.cpp" />
+               <Unit filename="opencvtest.cpp">
+                       <Option compile="0" />
+                       <Option link="0" />
+               </Unit>
                <Unit filename="shader/ShaderDot.cpp">
                        <Option compile="0" />
                        <Option link="0" />
@@ -223,6 +221,10 @@
                        <Option compile="0" />
                        <Option link="0" />
                </Unit>
+               <Unit filename="shader/ShaderLoader.cpp">
+                       <Option compile="0" />
+                       <Option link="0" />
+               </Unit>
                <Unit filename="shader/ShaderPlaidsBench.cpp">
                        <Option compile="0" />
                        <Option link="0" />