X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win32gl%2Fdev%2Fpsychlopswin32.cbp;h=b690a3e583e64b84b49e71ae703140763be182cc;hb=e77ebcd1edec379c18fefacdf9d91d140950f0a8;hp=4661b47114626cb77997b45477c304c1830540b4;hpb=94e7ea94e17165cae9f6cb9d657561ed7daa8790;p=psychlops%2Fcpp.git

diff --git a/win32gl/dev/psychlopswin32.cbp b/win32gl/dev/psychlopswin32.cbp
index 4661b47..b690a3e 100644
--- a/win32gl/dev/psychlopswin32.cbp
+++ b/win32gl/dev/psychlopswin32.cbp
@@ -48,6 +48,7 @@
 					<Add option="-Os" />
 					<Add option="-O3" />
 					<Add option="-DPSYCHLOPS_PLATFORM_WIN32GL" />
+					<Add option="-D___EXTENSIONS___" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -61,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" />
@@ -74,6 +75,7 @@
 					<Add option="-Os" />
 					<Add option="-O3" />
 					<Add option="-DPSYCHLOPS_PLATFORM_WIN32GL" />
+					<Add option="-D___EXTENSIONS___" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -103,6 +105,7 @@
 					<Add option="/GR" />
 					<Add option="/Ox" />
 					<Add option="/DPSYCHLOPS_PLATFORM_WIN32GL" />
+					<Add option="/D___EXTENSIONS___" />
 				</Compiler>
 				<Linker>
 					<Add library="OpenGL32" />
@@ -131,6 +134,7 @@
 					<Add option="/GR" />
 					<Add option="/Ox" />
 					<Add option="/DPSYCHLOPS_PLATFORM_WIN32GL" />
+					<Add option="/D___EXTENSIONS___" />
 				</Compiler>
 				<Linker>
 					<Add library="OpenGL32" />
@@ -211,6 +215,7 @@
 					<Add option="-Os" />
 					<Add option="-O3" />
 					<Add option="-DPSYCHLOPS_PLATFORM_WIN32GL" />
+					<Add option="-D___EXTENSIONS___" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -239,6 +244,7 @@
 					<Add option="/GR" />
 					<Add option="/Ox" />
 					<Add option="/DPSYCHLOPS_PLATFORM_WIN32GL" />
+					<Add option="/D___EXTENSIONS___" />
 				</Compiler>
 				<Linker>
 					<Add library="OpenGL32" />
@@ -255,6 +261,7 @@
 			<Add alias="All" targets="BCC5.51;VC9;MinGW;" />
 		</VirtualTargets>
 		<Compiler>
+			<Add option="___EXTENSIONS___" />
 			<Add directory="C:/Library/frameworks/opencv/build/include" />
 			<Add directory="C:/Library/frameworks/Psychlops.framework/cv/include" />
 		</Compiler>
@@ -330,6 +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">
+			<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" />
@@ -348,6 +369,7 @@
 			<Option target="VC9 Devices" />
 		</Unit>
 		<Unit filename="../../psychlops/extension/devices/psychlops_devices_nidaqmxbase.h" />
+		<Unit filename="../../psychlops/extension/devices/psychlops_devices_parallelport.h" />
 		<Unit filename="../../psychlops/extension/devices/psychlops_devices_util.cpp" />
 		<Unit filename="../../psychlops/extension/devices/psychlops_devices_util.h" />
 		<Unit filename="../../psychlops/extension/devices/psychlops_extentions_devices.h" />
@@ -367,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" />
@@ -394,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" />
@@ -411,6 +462,7 @@
 		<Unit filename="../../psychlops/platform/win32/psychlops_app_state_Win32.h" />
 		<Unit filename="../../psychlops/platform/win32/psychlops_app_thread_Win32.cpp" />
 		<Unit filename="../../psychlops/platform/win32/psychlops_app_tweak_Win32.h" />
+		<Unit filename="../../psychlops/platform/win32/psychlops_devices_parallelport_Win32.cpp" />
 		<Unit filename="../../psychlops/platform/win32/psychlops_io_API_Win32.cpp" />
 		<Unit filename="../../psychlops/platform/win32/psychlops_io_API_Win32.h" />
 		<Unit filename="../../psychlops/platform/win32/psychlops_io_clipboard_Win32.cpp" />