video-sdl: video sdl builds on windows with MSVC as well

6 files changed, 257 insertions, 6 deletions

diff --git a/gr-video-sdl/CMakeLists.txt b/gr-video-sdl/CMakeLists.txt
new file mode 100644
index 000000000..a5d4f1b49
--- /dev/null
+++ b/gr-video-sdl/CMakeLists.txt
@@ -0,0 +1,99 @@
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# Setup dependencies
+########################################################################
+INCLUDE(GrBoost)
+
+FIND_PACKAGE(SDL)
+
+########################################################################
+# Register component
+########################################################################
+INCLUDE(GrComponent)
+GR_REGISTER_COMPONENT("gr-video-sdl" ENABLE_GR_VIDEO_SDL
+    SDL_FOUND
+    Boost_FOUND
+    ENABLE_GR_CORE_
+)
+
+GR_SET_GLOBAL(GR_VIDEO_SDL_INCLUDE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
+########################################################################
+# Begin conditional configuration
+########################################################################
+IF(ENABLE_GR_VIDEO_SDL)
+
+########################################################################
+# Setup CPack components
+########################################################################
+INCLUDE(GrPackage)
+CPACK_SET(CPACK_COMPONENT_GROUP_VIDEO_SDL_DESCRIPTION "The GNU Radio Video SDL Blocks")
+
+CPACK_COMPONENT("video_sdl_runtime"
+    GROUP        "Video SDL"
+    DISPLAY_NAME "Runtime"
+    DESCRIPTION  "Runtime"
+    DEPENDS      "core_runtime"
+)
+
+CPACK_COMPONENT("video_sdl_devel"
+    GROUP        "Video SDL"
+    DISPLAY_NAME "Development"
+    DESCRIPTION  "C++ headers, package config, import libraries"
+    DEPENDS      "core_devel"
+)
+
+CPACK_COMPONENT("video_sdl_python"
+    GROUP        "Video SDL"
+    DISPLAY_NAME "Python"
+    DESCRIPTION  "Python modules for runtime; GRC xml files"
+    DEPENDS      "core_python;video_sdl_runtime"
+)
+
+CPACK_COMPONENT("video_sdl_swig"
+    GROUP        "Video SDL"
+    DISPLAY_NAME "SWIG"
+    DESCRIPTION  "SWIG development .i files"
+    DEPENDS      "core_swig;video_sdl_python;video_sdl_devel"
+)
+
+########################################################################
+# Add subdirectories
+########################################################################
+ADD_SUBDIRECTORY(src)
+
+########################################################################
+# Create Pkg Config File
+########################################################################
+CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-video-sdl.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.pc
+@ONLY)
+
+INSTALL(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.pc
+    DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+    COMPONENT "video_sdl_devel"
+)
+
+ENDIF(ENABLE_GR_VIDEO_SDL)
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
new file mode 100644
index 000000000..555b04e04
--- /dev/null
+++ b/gr-video-sdl/src/CMakeLists.txt
@@ -0,0 +1,116 @@
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# Setup the include and linker paths
+########################################################################
+INCLUDE_DIRECTORIES(
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_VIDEO_SDL_INCLUDE_DIRS}
+)
+
+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+
+INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
+
+########################################################################
+# Setup library
+########################################################################
+LIST(APPEND gr_video_sdl_sources
+    video_sdl_sink_uc.cc
+    video_sdl_sink_s.cc
+)
+
+LIST(APPEND video_sdl_libs
+    gnuradio-core
+    ${Boost_LIBRARIES}
+    ${SDL_LIBRARY}
+)
+
+ADD_LIBRARY(gnuradio-video-sdl SHARED ${gr_video_sdl_sources})
+TARGET_LINK_LIBRARIES(gnuradio-video-sdl ${video_sdl_libs})
+SET_TARGET_PROPERTIES(gnuradio-video-sdl PROPERTIES DEFINE_SYMBOL "gnuradio_video_sdl_EXPORTS")
+SET_TARGET_PROPERTIES(gnuradio-video-sdl PROPERTIES SOVERSION ${LIBVER})
+
+INSTALL(TARGETS gnuradio-video-sdl
+    LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "video_sdl_runtime" # .so/.dylib file
+    ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "video_sdl_devel" # .lib file
+    RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "video_sdl_runtime" # .dll file
+)
+
+########################################################################
+# Install public header files
+########################################################################
+INSTALL(FILES
+    video_sdl_api.h
+    video_sdl_sink_uc.h
+    video_sdl_sink_s.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
+    COMPONENT "video_sdl_devel"
+)
+
+########################################################################
+# Setup swig generation
+########################################################################
+IF(ENABLE_PYTHON)
+INCLUDE(GrPython)
+INCLUDE(GrSwig)
+
+SET(GR_SWIG_INCLUDE_DIRS
+    ${GR_COMEDI_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+)
+
+SET(GR_SWIG_LIBRARIES gnuradio-video-sdl)
+
+GR_SWIG_MAKE(video_sdl video_sdl.i)
+
+GR_SWIG_INSTALL(
+    TARGETS video_sdl
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio
+    COMPONENT "video_sdl_python"
+)
+
+INSTALL(
+    FILES video_sdl.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "video_sdl_swig"
+)
+
+ENDIF(ENABLE_PYTHON)
+
+########################################################################
+# Handle the unit tests
+########################################################################
+IF(ENABLE_TESTING AND ENABLE_PYTHON)
+INCLUDE(GrTest)
+FILE(GLOB py_qa_test_files "qa_*.py")
+FOREACH(py_qa_test_file ${py_qa_test_files})
+    GET_FILENAME_COMPONENT(py_qa_test_name ${py_qa_test_file} NAME_WE)
+    SET(GR_TEST_PYTHON_DIRS
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/python
+        ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
+        ${CMAKE_BINARY_DIR}/gr-video-sdl/src
+        ${CMAKE_BINARY_DIR}/gr-video-sdl/src/${CMAKE_BUILD_TYPE} #for WIN32 because it only auto-adds the outdir for swig dirs, not src dirs
+    )
+    SET(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-video-sdl)
+    GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
+ENDFOREACH(py_qa_test_file)
+ENDIF(ENABLE_TESTING AND ENABLE_PYTHON)
diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 04c39542a..496671bea 100644
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -33,6 +33,7 @@ noinst_PYTHON =				\
 	qa_video_sdl.py
 
 grinclude_HEADERS =			\
+	video_sdl_api.h			\
 	video_sdl_sink_uc.h		\
 	video_sdl_sink_s.h
 
diff --git a/gr-video-sdl/src/video_sdl_api.h b/gr-video-sdl/src/video_sdl_api.h
new file mode 100644
index 000000000..5418f86f0
--- /dev/null
+++ b/gr-video-sdl/src/video_sdl_api.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_VIDEO_SDL_API_H
+#define INCLUDED_VIDEO_SDL_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_video_sdl_EXPORTS
+#  define VIDEO_SDL_API __GR_ATTR_EXPORT
+#else
+#  define VIDEO_SDL_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_VIDEO_SDL_API_H */
diff --git a/gr-video-sdl/src/video_sdl_sink_s.h b/gr-video-sdl/src/video_sdl_sink_s.h
index 9d3651402..2ec15e36d 100644
--- a/gr-video-sdl/src/video_sdl_sink_s.h
+++ b/gr-video-sdl/src/video_sdl_sink_s.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_VIDEO_SDL_SINK_S_H
 #define INCLUDED_VIDEO_SDL_SINK_S_H
 
+#include <video_sdl_api.h>
 #include <gr_sync_block.h>
 #include <string>
 #include <SDL.h>
@@ -34,7 +35,7 @@
 class video_sdl_sink_s;
 typedef boost::shared_ptr<video_sdl_sink_s> video_sdl_sink_s_sptr;
 
-video_sdl_sink_s_sptr
+VIDEO_SDL_API video_sdl_sink_s_sptr
 video_sdl_make_sink_s (double framerate,int width=640, int height=480,unsigned int format=IMGFMT_YV12,int dst_width=-1,int dst_height=-1);
 
 /*!
@@ -47,8 +48,8 @@ video_sdl_make_sink_s (double framerate,int width=640, int height=480,unsigned i
  * Input samples must be in the range [0,255].
  */
 
-class video_sdl_sink_s : public gr_sync_block {
-  friend video_sdl_sink_s_sptr
+class VIDEO_SDL_API video_sdl_sink_s : public gr_sync_block {
+  friend VIDEO_SDL_API video_sdl_sink_s_sptr
   video_sdl_make_sink_s (double framerate,int width, int height,unsigned int format,int dst_width,int dst_height);
 
   int		d_chunk_size;
diff --git a/gr-video-sdl/src/video_sdl_sink_uc.h b/gr-video-sdl/src/video_sdl_sink_uc.h
index 955b003f8..435ddaa8f 100644
--- a/gr-video-sdl/src/video_sdl_sink_uc.h
+++ b/gr-video-sdl/src/video_sdl_sink_uc.h
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_VIDEO_SDL_SINK_UC_H
 #define INCLUDED_VIDEO_SDL_SINK_UC_H
 
+#include <video_sdl_api.h>
 #include <gr_sync_block.h>
 #include <string>
 #include <SDL.h>
@@ -34,7 +35,7 @@
 class video_sdl_sink_uc;
 typedef boost::shared_ptr<video_sdl_sink_uc> video_sdl_sink_uc_sptr;
 
-video_sdl_sink_uc_sptr
+VIDEO_SDL_API video_sdl_sink_uc_sptr
 video_sdl_make_sink_uc (double framerate,int width=640, int height=480,unsigned int format=IMGFMT_YV12,int dst_width=-1,int dst_height=-1);
 
 /*!
@@ -47,8 +48,8 @@ video_sdl_make_sink_uc (double framerate,int width=640, int height=480,unsigned
  * Input samples must be in the range [0,255].
  */
 
-class video_sdl_sink_uc : public gr_sync_block {
-  friend video_sdl_sink_uc_sptr
+class VIDEO_SDL_API video_sdl_sink_uc : public gr_sync_block {
+  friend VIDEO_SDL_API video_sdl_sink_uc_sptr
   video_sdl_make_sink_uc (double framerate,int width, int height,unsigned int format,int dst_width,int dst_height);
 
   int		d_chunk_size;