Menu
▾
▴
[Hugin-cvs] SF.net SVN: hugin:[5076] hugin/trunk
|
From: <tm...@us...> - 2010-03-21 14:27:52
|
Revision: 5076
http://hugin.svn.sourceforge.net/hugin/?rev=5076&view=rev
Author: tmodes
Date: 2010-03-21 14:27:39 +0000 (Sun, 21 Mar 2010)
Log Message:
-----------
Added option to build Hugin with dynamic libs on windows
(disabled by default because this requires to rebuild all dependecies as dynamic libs)
Modified Paths:
--------------
hugin/trunk/CMakeLists.txt
hugin/trunk/CMakeModules/FindExiv2.cmake
hugin/trunk/CMakeModules/FindGLEW.cmake
hugin/trunk/CMakeModules/FindGLUT.cmake
hugin/trunk/CMakeModules/FindJPEG.cmake
hugin/trunk/CMakeModules/FindPNG.cmake
hugin/trunk/CMakeModules/FindTIFF.cmake
hugin/trunk/CMakeModules/FindZLIB.cmake
hugin/trunk/CMakeModules/win_bundle.cmake
hugin/trunk/src/celeste/CMakeLists.txt
hugin/trunk/src/celeste/Celeste.cpp
hugin/trunk/src/celeste/Celeste.h
hugin/trunk/src/celeste/CelesteGlobals.h
hugin/trunk/src/celeste/Utilities.h
hugin/trunk/src/foreign/ANN/ANN.h
hugin/trunk/src/foreign/ANN/CMakeLists.txt
hugin/trunk/src/foreign/vigra/vigra/config.hxx
hugin/trunk/src/foreign/vigra/vigra/diff2d.hxx
hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt
hugin/trunk/src/hugin1/base_wx/CMakeLists.txt
hugin/trunk/src/hugin1/base_wx/ImageCache.h
hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h
hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h
hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp
hugin/trunk/src/hugin1/base_wx/PTWXDlg.h
hugin/trunk/src/hugin1/base_wx/RunStitchPanel.h
hugin/trunk/src/hugin1/base_wx/huginConfig.h
hugin/trunk/src/hugin1/base_wx/platform.h
hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
hugin/trunk/src/hugin1/hugin/GLViewer.cpp
hugin/trunk/src/hugin1/hugin/MeshManager.cpp
hugin/trunk/src/hugin1/hugin/PreviewDifferenceTool.cpp
hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp
hugin/trunk/src/hugin1/hugin/TextureManager.cpp
hugin/trunk/src/hugin_base/CMakeLists.txt
hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h
hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h
hugin/trunk/src/hugin_base/algorithms/basic/CalculateCPStatistics.h
hugin/trunk/src/hugin_base/algorithms/basic/CalculateMeanExposure.h
hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalROI.h
hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalScale.h
hugin/trunk/src/hugin_base/algorithms/basic/RotatePanorama.h
hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.h
hugin/trunk/src/hugin_base/algorithms/control_points/CleanCP.h
hugin/trunk/src/hugin_base/algorithms/nona/CalculateFOV.h
hugin/trunk/src/hugin_base/algorithms/nona/CenterHorizontally.h
hugin/trunk/src/hugin_base/algorithms/nona/ComputeImageROI.h
hugin/trunk/src/hugin_base/algorithms/nona/FitPanorama.h
hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h
hugin/trunk/src/hugin_base/algorithms/optimizer/ImageGraph.h
hugin/trunk/src/hugin_base/algorithms/optimizer/PTOptimizer.h
hugin/trunk/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h
hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h
hugin/trunk/src/hugin_base/algorithms/point_sampler/PointSampler.h
hugin/trunk/src/hugin_base/appbase/DocumentData.h
hugin/trunk/src/hugin_base/appbase/ProgressDisplay.h
hugin/trunk/src/hugin_base/appbase/ProgressDisplayOld.h
hugin/trunk/src/hugin_base/appbase/ProgressReporterOld.h
hugin/trunk/src/hugin_base/hugin_math/Matrix3.h
hugin/trunk/src/hugin_base/hugin_math/hugin_math.h
hugin/trunk/src/hugin_base/hugin_utils/platform.h
hugin/trunk/src/hugin_base/hugin_utils/utils.h
hugin/trunk/src/hugin_base/huginapp/CachedImageRemapper.h
hugin/trunk/src/hugin_base/huginapp/ImageCache.h
hugin/trunk/src/hugin_base/nona/SpaceTransform.h
hugin/trunk/src/hugin_base/nona/Stitcher.h
hugin/trunk/src/hugin_base/panodata/ControlPoint.h
hugin/trunk/src/hugin_base/panodata/DestPanoImage.h
hugin/trunk/src/hugin_base/panodata/ImageVariable.h
hugin/trunk/src/hugin_base/panodata/ImageVariableGroup.h
hugin/trunk/src/hugin_base/panodata/ImageVariableTranslate.h
hugin/trunk/src/hugin_base/panodata/Lens.h
hugin/trunk/src/hugin_base/panodata/Mask.h
hugin/trunk/src/hugin_base/panodata/PTScriptParsing.h
hugin/trunk/src/hugin_base/panodata/Panorama.h
hugin/trunk/src/hugin_base/panodata/PanoramaData.h
hugin/trunk/src/hugin_base/panodata/PanoramaOptions.h
hugin/trunk/src/hugin_base/panodata/PanoramaVariable.h
hugin/trunk/src/hugin_base/panodata/SrcPanoImage.h
hugin/trunk/src/hugin_base/panodata/StandardImageVariableGroups.h
hugin/trunk/src/hugin_base/panotools/PanoToolsInterface.h
hugin/trunk/src/hugin_base/panotools/PanoToolsOptimizerWrapper.h
hugin/trunk/src/hugin_base/panotools/PanoToolsUtils.h
hugin/trunk/src/hugin_base/vigra_ext/Correlation.h
hugin/trunk/src/hugin_base/vigra_ext/ImageTransformsGPU.cpp
hugin/trunk/src/hugin_base/vigra_ext/MultiThreadOperations.h
hugin/trunk/src/hugin_base/vigra_ext/emor.h
hugin/trunk/src/tools/nona.cpp
Added Paths:
-----------
hugin/trunk/src/hugin_shared.h
Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076)
@@ -74,6 +74,7 @@
include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/vigra )
include_directories( ${CMAKE_SOURCE_DIR}/src/celeste )
include_directories( ${CMAKE_BINARY_DIR}/src/celeste )
+include_directories( ${CMAKE_SOURCE_DIR}/src )
# this function is not available on some systems, notably FreeBSD and Windows
include(CheckFunctionExists)
@@ -97,6 +98,12 @@
FIND_PACKAGE(PkgConfig)
ENDIF (UNIX)
+IF(WIN32)
+ set(HUGIN_SHARED "0" CACHE STRING "Build shared internal libraries" )
+ELSE(WIN32)
+ set(HUGIN_SHARED "1" CACHE STRING "Build shared internal libraries" )
+ENDIF(WIN32)
+
#
# Setup windows search paths for dependencies
#
@@ -172,7 +179,11 @@
FIND_PACKAGE(OpenGL)
IF(WIN32)
IF(NOT GLUT_ROOT_PATH)
- SET(GLUT_ROOT_PATH ${SOURCE_BASE_DIR}/glut)
+ IF(${HUGIN_SHARED})
+ SET(GLUT_ROOT_PATH ${SOURCE_BASE_DIR}/freeglut-2.6.0)
+ ELSE(${HUGIN_SHARED})
+ SET(GLUT_ROOT_PATH ${SOURCE_BASE_DIR}/glut)
+ ENDIF(${HUGIN_SHARED})
ENDIF(NOT GLUT_ROOT_PATH)
ENDIF(WIN32)
FIND_PACKAGE(GLUT)
@@ -207,11 +218,18 @@
# Now it is a cache variable you can edit in cmakesetup --TKS
#
IF( NOT Boost_root_suffix )
- SET( Boost_root_suffix _1_39_0 CACHE STRING "suffix of boost root dir." FORCE )
+ SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE )
ENDIF( NOT Boost_root_suffix )
IF(WIN32)
- SET(Boost_USE_STATIC_LIBS ON)
+ IF(${HUGIN_SHARED})
+ SET(Boost_USE_STATIC_LIBS OFF)
+ # ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK)
+ # ADD_DEFINITIONS(-D_DLL)
+ ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB)
+ ELSE(${HUGIN_SHARED})
+ SET(Boost_USE_STATIC_LIBS ON)
+ ENDIF(${HUGIN_SHARED})
# If BOOST_ROOT was defined in the environment, use it.
if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "")
set(BOOST_ROOT $ENV{BOOST_ROOT})
@@ -272,7 +290,6 @@
# allow user to specify lib suffix
set(LIB_SUFFIX "" CACHE STRING "Define suffix of lib directory name (32/64)" )
-set(HUGIN_SHARED "1" CACHE STRING "Build shared internal libraries" )
IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
MESSAGE("Building in Debug mode, resulting programs will be SLOW")
@@ -327,9 +344,14 @@
MESSAGE("-- Using shared internal libraries")
ELSE (UNIX)
- # no shared libs DLL on windows. The code is just
- # not set up for that..
- ADD_DEFINITIONS(-DVIGRA_STATIC_LIB)
+ IF (${HUGIN_SHARED})
+ ADD_DEFINITIONS(-DVIGRA_DLL)
+ ADD_DEFINITIONS(-DOPENEXR_DLL)
+ ADD_DEFINITIONS(-DHugin_shared)
+ SET(HUGIN_SHARED_LIBS 1)
+ ELSE(${HUGIN_SHARED})
+ ADD_DEFINITIONS(-DVIGRA_STATIC_LIB)
+ ENDIF(${HUGIN_SHARED})
# Windows installer packaging related stuff
# unfortunately, CMake/CPack does not support Warsetup directly.
@@ -351,6 +373,7 @@
# "Linking to lib file: libboost_thread-vc90-mt-s-1_37.lib"
# This can be used to determine on which boost libraries Hugin depend on
#ADD_DEFINITIONS(/DBOOST_LIB_DIAGNOSTIC)
+ IF(NOT ${HUGIN_SHARED})
# compile everything for the static C runtime
FOREACH(TYPE C CXX)
# makefiles use blank configuration
@@ -374,6 +397,7 @@
"${NEW_FLAGS} /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\""
CACHE STRING "for MSVC" FORCE
)
+ ENDIF(NOT ${HUGIN_SHARED})
ENDIF(MSVC)
ENDIF (UNIX)
Modified: hugin/trunk/CMakeModules/FindExiv2.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindExiv2.cmake 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/CMakeModules/FindExiv2.cmake 2010-03-21 14:27:39 UTC (rev 5076)
@@ -79,18 +79,32 @@
include(FindLibraryWithDebug)
- find_library_with_debug(EXIV2_LIBRARIES
- WIN32_DEBUG_POSTFIX d
- NAMES exiv2 libexiv2
- PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib
- )
+ IF(${HUGIN_SHARED})
+ find_library_with_debug(EXIV2_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES exiv2 libexiv2
+ PATHS ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
+ )
- find_library_with_debug(EXIV2EXPAT_LIBRARIES
- WIN32_DEBUG_POSTFIX d
- NAMES libexpat
- PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib
- )
+ find_library_with_debug(EXIV2EXPAT_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES libexpat
+ PATHS ${SOURCE_BASE_DIR}/expat-2.0.1/win32/bin/Release
+ )
+ ELSE(${HUGIN_SHARED})
+ find_library_with_debug(EXIV2_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES exiv2 libexiv2
+ PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib
+ )
+ find_library_with_debug(EXIV2EXPAT_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES libexpat
+ PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib
+ )
+ ENDIF(${HUGIN_SHARED})
+
SET(EXIV2_LIBRARIES ${EXIV2_LIBRARIES} ${EXIV2EXPAT_LIBRARIES})
include(FindPackageHandleStandardArgs)
Modified: hugin/trunk/CMakeModules/FindGLEW.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindGLEW.cmake 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/CMakeModules/FindGLEW.cmake 2010-03-21 14:27:39 UTC (rev 5076)
@@ -6,7 +6,11 @@
IF(WIN32)
FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h PATHS ${SOURCE_BASE_DIR}/glew/include)
# for dynamic build, it's glew32.lib and the dll must be copied into hugin's bin folder
+ IF(${HUGIN_SHARED})
+ SET(GLEW_LIBRARIES ${SOURCE_BASE_DIR}/glew/lib/glew32.lib)
+ ELSE(${HUGIN_SHARED})
SET(GLEW_LIBRARIES ${SOURCE_BASE_DIR}/glew/lib/glew32s.lib)
+ ENDIF(${HUGIN_SHARED})
ELSE(WIN32)
FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h PATHS /usr/include /usr/local/include)
FIND_LIBRARY(GLEW_LIBRARIES GLEW PATHS /usr/lib /usr/local/lib)
Modified: hugin/trunk/CMakeModules/FindGLUT.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindGLUT.cmake 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/CMakeModules/FindGLUT.cmake 2010-03-21 14:27:39 UTC (rev 5076)
@@ -17,6 +17,7 @@
${GLUT_ROOT_PATH}
${GLUT_ROOT_PATH}/Release
${GLUT_ROOT_PATH}/lib
+ ${GLUT_ROOT_PATH}/VisualStudio2008/Release
)
ELSE (WIN32)
Modified: hugin/trunk/CMakeModules/FindJPEG.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindJPEG.cmake 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/CMakeModules/FindJPEG.cmake 2010-03-21 14:27:39 UTC (rev 5076)
@@ -17,6 +17,7 @@
FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h
/usr/local/include
/usr/include
+ ${SOURCE_BASE_DIR}/jpeg-8
${wxWidgets_ROOT_DIR}/src/jpeg
)
@@ -25,7 +26,7 @@
find_library_with_debug(JPEG_LIBRARIES
WIN32_DEBUG_POSTFIX d
NAMES jpeg libjpeg wxjpeg
- PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+ PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/jpeg-8/Release ${SOURCE_BASE_DIR}/jpeg-8/lib ${wxWidgets_LIB_DIR}
)
Modified: hugin/trunk/CMakeModules/FindPNG.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindPNG.cmake 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/CMakeModules/FindPNG.cmake 2010-03-21 14:27:39 UTC (rev 5076)
@@ -24,13 +24,14 @@
FIND_PATH(PNG_INCLUDE_DIR png.h
/usr/local/include
/usr/include
+ ${SOURCE_BASE_DIR}/lpng140
${wxWidgets_ROOT_DIR}/src/png
)
find_library_with_debug(PNG_LIBRARIES
WIN32_DEBUG_POSTFIX d
- NAMES png libpng wxpng
- PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+ NAMES png libpng libpng14 wxpng
+ PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/lpng140/lib ${wxWidgets_LIB_DIR}
)
include(FindPackageHandleStandardArgs)
Modified: hugin/trunk/CMakeModules/FindTIFF.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindTIFF.cmake 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/CMakeModules/FindTIFF.cmake 2010-03-21 14:27:39 UTC (rev 5076)
@@ -17,6 +17,7 @@
FIND_PATH(TIFF_INCLUDE_DIR tiff.h
/usr/local/include
/usr/include
+ ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
${SOURCE_BASE_DIR}/tiff-3.8.2/libtiff
${SOURCE_BASE_DIR}/tiff-4.0.0alpha/libtiff
${wxWidgets_ROOT_DIR}/src/tiff
@@ -24,14 +25,27 @@
include(FindLibraryWithDebug)
-find_library_with_debug(TIFF_LIBRARIES
- WIN32_DEBUG_POSTFIX d
- NAMES tiff libtiff wxtiff
- PATHS /usr/lib /usr/local/lib
- ${SOURCE_BASE_DIR}/tiff-3.8.2/libtiff
- ${SOURCE_BASE_DIR}/tiff-4.0.0alpha/libtiff
- ${wxWidgets_LIB_DIR}
-)
+IF(WIN32 AND ${HUGIN_SHARED})
+# on windows the libtiff library contains a static lib libtiff
+# and the import library libtiff_i for dynamic build
+ find_library(TIFF_LIBRARIES
+ NAMES libtiff_i
+ PATHS /usr/lib /usr/local/lib
+ ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
+ )
+MESSAGE(STATUS "Searching dll ${TIFF_LIBRARIES}")
+ELSE(WIN32 AND ${HUGIN_SHARED})
+ find_library_with_debug(TIFF_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+ NAMES tiff libtiff wxtiff
+ PATHS /usr/lib /usr/local/lib
+ ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
+ ${SOURCE_BASE_DIR}/tiff-3.8.2/libtiff
+ ${SOURCE_BASE_DIR}/tiff-4.0.0alpha/libtiff
+ ${wxWidgets_LIB_DIR}
+ )
+MESSAGE(STATUS "Searching static ${TIFF_LIBRARIES}")
+ENDIF(WIN32 AND ${HUGIN_SHARED})
include(FindPackageHandleStandardArgs)
Modified: hugin/trunk/CMakeModules/FindZLIB.cmake
===================================================================
--- hugin/trunk/CMakeModules/FindZLIB.cmake 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/CMakeModules/FindZLIB.cmake 2010-03-21 14:27:39 UTC (rev 5076)
@@ -23,6 +23,7 @@
FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
/usr/local/include
/usr/include
+ ${SOURCE_BASE_DIR}/zlib
${wxWidgets_ROOT_DIR}/src/zlib
)
@@ -30,8 +31,8 @@
find_library_with_debug(ZLIB_LIBRARIES
WIN32_DEBUG_POSTFIX d
- NAMES z zlib wxzlib
- PATHS /usr/lib /usr/local/lib ${wxWidgets_LIB_DIR}
+ NAMES z zlib zlib1 wxzlib
+ PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/zlib ${wxWidgets_LIB_DIR}
)
Modified: hugin/trunk/CMakeModules/win_bundle.cmake
===================================================================
--- hugin/trunk/CMakeModules/win_bundle.cmake 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/CMakeModules/win_bundle.cmake 2010-03-21 14:27:39 UTC (rev 5076)
@@ -20,10 +20,17 @@
${SOURCE_BASE_DIR}/libpano/tools
"${SOURCE_BASE_DIR}/libpano/pano13/tools/Release CMD/Win32"
${SOURCE_BASE_DIR}/libpano/tools/Release
+ ${SOURCE_BASE_DIR}/libpano13/bin
DOC "Location of pano13 executables"
NO_DEFAULT_PATH)
FILE(GLOB PANO13_EXECUTABLES ${PANO13_EXE_DIR}/*.exe)
INSTALL(FILES ${PANO13_EXECUTABLES} DESTINATION ${BINDIR})
+ IF(${HUGIN_SHARED})
+ FIND_FILE(PANO13_DLL pano13.dll
+ PATHS ${SOURCE_BASE_DIR}/libpano13/lib
+ )
+ INSTALL(FILES ${PANO13_DLL} DESTINATION ${BINDIR})
+ ENDIF(${HUGIN_SHARED})
# TODO: install documentation for panotools?
FIND_PATH(PANO13_SRC_DIR filter.h
@@ -112,5 +119,64 @@
FILE(GLOB AP_SIFT_MAN ${AP_SIFT_DIR}/share/man/man*/*)
INSTALL(FILES ${AP_SIFT_MAN} DESTINATION doc/autopano-sift-C)
+ # now install all necessary DLL
+ IF(${HUGIN_SHARED})
+ FIND_FILE(TIFF_DLL
+ NAMES libtiff.dll
+ PATHS ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
+ )
+ FIND_FILE(JPEG_DLL
+ NAMES jpeg.dll
+ PATHS ${SOURCE_BASE_DIR}/jpeg-8/Release
+ )
+ FIND_FILE(PNG_DLL
+ NAMES libpng14.dll
+ PATHS ${SOURCE_BASE_DIR}/lpng140/lib
+ )
+ FIND_FILE(ZLIB_DLL
+ NAMES zlib1.dll
+ PATHS ${SOURCE_BASE_DIR}/zlib
+ NO_SYSTEM_ENVIRONMENT_PATH
+ )
+ FIND_PATH(OPENEXR_BIN_DIR Half.dll
+ ${SOURCE_BASE_DIR}/Deploy/bin/Release
+ DOC "Location of OpenEXR libraries"
+ NO_DEFAULT_PATH
+ )
+ FILE(GLOB OPENEXR_DLL ${OPENEXR_BIN_DIR}/*.dll)
+ FILE(GLOB BOOST_THREAD_DLL ${Boost_LIBRARY_DIRS}/boost_thread*.dll)
+ FIND_FILE(EXIV2_DLL
+ NAMES exiv2.dll
+ PATHS ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
+ )
+ FIND_FILE(LIBEXPAT_DLL
+ NAMES libexpat.dll
+ PATHS ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/bin/ReleaseDLL
+ )
+ FIND_FILE(GLEW_DLL
+ NAMES glew32.dll
+ PATHS ${SOURCE_BASE_DIR}/glew/bin
+ )
+ FIND_FILE(GLUT_DLL
+ NAMES glut.dll freeglut.dll
+ PATHS ${SOURCE_BASE_DIR}/freeglut-2.6.0/VisualStudio2008/Release ${SOURCE_BASE_DIR}/glut/Release
+ )
+ # hand tuned dll, so that only necesarry dll are install and not all wxWidgets DLL to save space
+ FIND_FILE(WXWIDGETS_DLL1 NAMES wxbase28u_vc_custom.dll PATHS ${wxWidgets_LIB_DIR})
+ FIND_FILE(WXWIDGETS_DLL2 NAMES wxmsw28u_core_vc_custom.dll PATHS ${wxWidgets_LIB_DIR})
+ FIND_FILE(WXWIDGETS_DLL3 NAMES wxmsw28u_xrc_vc_custom.dll PATHS ${wxWidgets_LIB_DIR})
+ FIND_FILE(WXWIDGETS_DLL4 NAMES wxmsw28u_adv_vc_custom.dll PATHS ${wxWidgets_LIB_DIR})
+ FIND_FILE(WXWIDGETS_DLL5 NAMES wxmsw28u_gl_vc_custom.dll PATHS ${wxWidgets_LIB_DIR})
+ FIND_FILE(WXWIDGETS_DLL6 NAMES wxmsw28u_html_vc_custom.dll PATHS ${wxWidgets_LIB_DIR})
+ FIND_FILE(WXWIDGETS_DLL7 NAMES wxbase28u_xml_vc_custom.dll PATHS ${wxWidgets_LIB_DIR})
+
+ INSTALL(FILES ${TIFF_DLL} ${JPEG_DLL} ${PNG_DLL} ${ZLIB_DLL} ${OPENEXR_DLL}
+ ${BOOST_THREAD_DLL} ${EXIV2_DLL} ${LIBEXPAT_DLL} ${GLEW_DLL} ${GLUT_DLL}
+ ${WXWIDGETS_DLL1} ${WXWIDGETS_DLL2} ${WXWIDGETS_DLL2} ${WXWIDGETS_DLL3}
+ ${WXWIDGETS_DLL3} ${WXWIDGETS_DLL4} ${WXWIDGETS_DLL5} ${WXWIDGETS_DLL6}
+ ${WXWIDGETS_DLL7}
+ DESTINATION ${BINDIR}
+ )
+ ENDIF(${HUGIN_SHARED})
ENDIF(WIN32)
Modified: hugin/trunk/src/celeste/CMakeLists.txt
===================================================================
--- hugin/trunk/src/celeste/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/celeste/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076)
@@ -74,7 +74,11 @@
ADD_LIBRARY(celeste SHARED ${CELESTE_SRC})
TARGET_LINK_LIBRARIES(celeste huginbasewx ${common_libs})
set_target_properties(celeste PROPERTIES VERSION ${HUGIN_LIB_VERSION})
- install(TARGETS celeste DESTINATION ${LIBDIR})
+ IF(WIN32)
+ install(TARGETS celeste RUNTIME DESTINATION ${BINDIR})
+ ELSE(WIN32)
+ install(TARGETS celeste DESTINATION ${LIBDIR})
+ ENDIF(WIN32)
ELSE (${HUGIN_SHARED_LIBS})
# messages are quite obtrusive in windows cmakesetup.exe
IF (NOT WIN32)
Modified: hugin/trunk/src/celeste/Celeste.cpp
===================================================================
--- hugin/trunk/src/celeste/Celeste.cpp 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/celeste/Celeste.cpp 2010-03-21 14:27:39 UTC (rev 5076)
@@ -31,6 +31,7 @@
#include "Gabor.h"
#include "Utilities.h"
#include "CelesteGlobals.h"
+#include "Celeste.h"
#include "svm.h"
#include <stdio.h>
Modified: hugin/trunk/src/celeste/Celeste.h
===================================================================
--- hugin/trunk/src/celeste/Celeste.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/celeste/Celeste.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -22,13 +22,14 @@
#ifndef __CELESTE__
#define __CELESTE__
+#include <hugin_shared.h>
#include "svm.h"
#include <string>
#include <vector>
using namespace std;
-void get_gabor_response(string&,unsigned int&,string&,double&,string&,vector<double>&);
+IMPEX void get_gabor_response(string&,unsigned int&,string&,double&,string&,vector<double>&);
#endif
Modified: hugin/trunk/src/celeste/CelesteGlobals.h
===================================================================
--- hugin/trunk/src/celeste/CelesteGlobals.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/celeste/CelesteGlobals.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -21,19 +21,20 @@
#ifndef GLOBALS_H
#define GLOBALS_H
+#include <hugin_shared.h>
extern bool kSaveFilter;
extern bool kVerbosity;
-extern int gRadius;
-extern float gS;
-extern int gA;
-extern int gF;
-extern float gL;
-extern float gU;
-extern int gNumLocs;
-extern int **gLocations;
-extern int spacing;
-extern int resize_dimension;
+extern IMPEX int gRadius;
+extern IMPEX float gS;
+extern IMPEX int gA;
+extern IMPEX int gF;
+extern IMPEX float gL;
+extern IMPEX float gU;
+extern IMPEX int gNumLocs;
+extern IMPEX int **gLocations;
+extern IMPEX int spacing;
+extern IMPEX int resize_dimension;
#endif
Modified: hugin/trunk/src/celeste/Utilities.h
===================================================================
--- hugin/trunk/src/celeste/Utilities.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/celeste/Utilities.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -28,6 +28,7 @@
#ifndef __UTILITIES__
#define __UTILITIES__
+#include <hugin_shared.h>
#include <fstream>
#include <iostream>
#include <stdio.h>
@@ -41,39 +42,39 @@
kRight
};
-void Permute( int* array, size_t size );
-int cmp(const void *s1, const void *s2); // for qsort() function
+IMPEX void Permute( int* array, size_t size );
+IMPEX int cmp(const void *s1, const void *s2); // for qsort() function
-float Heavyside( float a );
+IMPEX float Heavyside( float a );
-float Sigmoid( float act );
-float Sigmoid( float beta, float a_pot );
-float Sigmoid( float beta, float a_pot, float thresh );
+IMPEX float Sigmoid( float act );
+IMPEX float Sigmoid( float beta, float a_pot );
+IMPEX float Sigmoid( float beta, float a_pot, float thresh );
-int **CreateMatrix( int val, int row, int col );
-void ResetMatrix( int ** matrix, int val, int row, int col );
-void DisposeMatrix( int** matrix, int row );
+IMPEX int **CreateMatrix( int val, int row, int col );
+IMPEX void ResetMatrix( int ** matrix, int val, int row, int col );
+IMPEX void DisposeMatrix( int** matrix, int row );
-float **CreateMatrix( float val, int row, int col );
-void ResetMatrix( float ** matrix, float val, int row, int col );
-void DisposeMatrix( float** matrix, int row );
+IMPEX float **CreateMatrix( float val, int row, int col );
+IMPEX void ResetMatrix( float ** matrix, float val, int row, int col );
+IMPEX void DisposeMatrix( float** matrix, int row );
-float ReturnDistance( float *pat1, float *pat2, int size );
+IMPEX float ReturnDistance( float *pat1, float *pat2, int size );
-void GetStreamDefaults( void );
-void AdjustStream( ostream &os, int precision, int width, int pos, bool trailers );
-void SetStreamDefaults( ostream &os );
+IMPEX void GetStreamDefaults( void );
+IMPEX void AdjustStream( ostream &os, int precision, int width, int pos, bool trailers );
+IMPEX void SetStreamDefaults( ostream &os );
-void SkipComments( ifstream* infile );
-void FileCreateError( char* filename );
-void FileOpenError( char* filename );
+IMPEX void SkipComments( ifstream* infile );
+IMPEX void FileCreateError( char* filename );
+IMPEX void FileOpenError( char* filename );
-double SafeAbs( double val1, double val2 );
-float SafeAbs( float val1, float val2 );
-int SafeAbs( int val1, int val2 );
-double SafeAbs( double val );
-float SafeAbs( float val );
-int SafeAbs( int val );
+IMPEX double SafeAbs( double val1, double val2 );
+IMPEX float SafeAbs( float val1, float val2 );
+IMPEX int SafeAbs( int val1, int val2 );
+IMPEX double SafeAbs( double val );
+IMPEX float SafeAbs( float val );
+IMPEX int SafeAbs( int val );
#endif
Modified: hugin/trunk/src/foreign/ANN/ANN.h
===================================================================
--- hugin/trunk/src/foreign/ANN/ANN.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/foreign/ANN/ANN.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -58,8 +58,8 @@
#define ANN_H
// dangelo: only DLL if set to SHARED CMakeLists.txt file
-#if WIN32
-#if huginANN_EXPORTS
+#if WIN32 && defined Hugin_shared
+#ifdef huginANN_EXPORTS
//----------------------------------------------------------------------
// For Microsoft Visual C++, externally accessible symbols must be
// explicitly indicated with DLL_API, which is somewhat like "extern."
@@ -74,18 +74,14 @@
// this macro as being exported.
//----------------------------------------------------------------------
- #ifdef DLL_EXPORTS
- #define DLL_API __declspec(dllexport)
- #else
- #define DLL_API __declspec(dllimport)
- #endif
+ #define DLL_API __declspec(dllexport)
#else
- #define DLL_API
+ #define DLL_API __declspec(dllimport)
#endif
+#else
//----------------------------------------------------------------------
// DLL_API is ignored for all other systems
//----------------------------------------------------------------------
-#else
#define DLL_API
#endif
Modified: hugin/trunk/src/foreign/ANN/CMakeLists.txt
===================================================================
--- hugin/trunk/src/foreign/ANN/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/foreign/ANN/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076)
@@ -12,7 +12,11 @@
IF (${HUGIN_SHARED_LIBS})
add_library(huginANN SHARED ${ANN_SRC} ${ANN_HEADERS})
set_target_properties(huginANN PROPERTIES VERSION ${HUGIN_LIB_VERSION})
- install(TARGETS huginANN DESTINATION ${LIBDIR})
+ IF(WIN32)
+ install(TARGETS huginANN RUNTIME DESTINATION ${BINDIR})
+ ELSE(WIN32)
+ install(TARGETS huginANN DESTINATION ${LIBDIR})
+ ENDIF(WIN32)
ELSE (${HUGIN_SHARED_LIBS})
add_library(huginANN STATIC ${ANN_SRC} ${ANN_HEADERS})
ENDIF (${HUGIN_SHARED_LIBS})
Modified: hugin/trunk/src/foreign/vigra/vigra/config.hxx
===================================================================
--- hugin/trunk/src/foreign/vigra/vigra/config.hxx 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/foreign/vigra/vigra/config.hxx 2010-03-21 14:27:39 UTC (rev 5076)
@@ -104,7 +104,11 @@
#define VIGRA_NEED_BIN_STREAMS
#ifdef VIGRA_DLL
- #define VIGRA_EXPORT __declspec(dllexport)
+ #ifdef huginvigraimpex_EXPORTS
+ #define VIGRA_EXPORT __declspec(dllexport)
+ #else
+ #define VIGRA_EXPORT __declspec(dllimport)
+ #endif
#elif defined(VIGRA_STATIC_LIB)
#define VIGRA_EXPORT
#else
Modified: hugin/trunk/src/foreign/vigra/vigra/diff2d.hxx
===================================================================
--- hugin/trunk/src/foreign/vigra/vigra/diff2d.hxx 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/foreign/vigra/vigra/diff2d.hxx 2010-03-21 14:27:39 UTC (rev 5076)
@@ -182,7 +182,7 @@
<b>\#include</b> "<a href="diff2d_8hxx-source.html">vigra/utilities.hxx</a>"<br>
Namespace: vigra
*/
-class Diff2D
+class VIGRA_EXPORT Diff2D
{
public:
/** The iterator's value type: a coordinate.
@@ -480,7 +480,7 @@
<b>\#include</b> "<a href="diff2d_8hxx-source.html">vigra/utilities.hxx</a>"<br>
Namespace: vigra
*/
-class Size2D : public Diff2D
+class VIGRA_EXPORT Size2D : public Diff2D
{
public:
/** Default Constructor. Init point at position (0,0)
@@ -590,7 +590,7 @@
<b>\#include</b> "<a href="diff2d_8hxx-source.html">vigra/utilities.hxx</a>"<br>
Namespace: vigra
*/
-class Point2D : public Diff2D
+class VIGRA_EXPORT Point2D : public Diff2D
{
public:
/** The iterator's value type: a coordinate.
@@ -870,7 +870,7 @@
<b>\#include</b> "<a href="diff2d_8hxx-source.html">vigra/utilities.hxx</a>"<br>
Namespace: vigra
*/
-class Rect2D
+class VIGRA_EXPORT Rect2D
{
Point2D upperLeft_, lowerRight_;
Modified: hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt
===================================================================
--- hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/foreign/vigra/vigra_impex/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076)
@@ -8,7 +8,11 @@
IF (${HUGIN_SHARED_LIBS})
add_library(huginvigraimpex SHARED ${VIGRA_IMPEX_SRC} ${VIGRA_IMPEX_HEADER})
set_target_properties(huginvigraimpex PROPERTIES VERSION ${HUGIN_LIB_VERSION})
- install(TARGETS huginvigraimpex DESTINATION ${LIBDIR})
+ IF(WIN32)
+ install(TARGETS huginvigraimpex RUNTIME DESTINATION ${BINDIR})
+ ELSE(WIN32)
+ install(TARGETS huginvigraimpex DESTINATION ${LIBDIR})
+ ENDIF(WIN32)
ELSE (${HUGIN_SHARED_LIBS})
add_library(huginvigraimpex STATIC ${VIGRA_IMPEX_SRC} ${VIGRA_IMPEX_HEADER})
ENDIF (${HUGIN_SHARED_LIBS})
Modified: hugin/trunk/src/hugin1/base_wx/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin1/base_wx/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/base_wx/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076)
@@ -7,11 +7,16 @@
RunStitchPanel.h )
-IF ($HUGIN_SHARED_LIBS)
+IF (${HUGIN_SHARED_LIBS})
add_library(huginbasewx SHARED ${HUGIN_WX_BASE_SRC} ${HUGIN_WX_BASE_HEADER})
- set_target_properties(huginbasewx VERSION ${HUGIN_LIB_VERSION})
- install(TARGETS huginbasewx DESTINATION ${LIBDIR})
-ELSE ($HUGIN_SHARED_LIBS)
+ target_link_libraries(huginbasewx ${wxWidgets_LIBRARIES} huginbase ${common_libs})
+ set_target_properties(huginbasewx PROPERTIES VERSION ${HUGIN_LIB_VERSION})
+ IF(WIN32)
+ install(TARGETS huginbasewx RUNTIME DESTINATION ${BINDIR})
+ ELSE(WIN32)
+ install(TARGETS huginbasewx DESTINATION ${LIBDIR})
+ ENDIF(WIN32)
+ELSE (${HUGIN_SHARED_LIBS})
add_library(huginbasewx STATIC ${HUGIN_WX_BASE_SRC} ${HUGIN_WX_BASE_HEADER})
-ENDIF ($HUGIN_SHARED_LIBS)
+ENDIF (${HUGIN_SHARED_LIBS})
Modified: hugin/trunk/src/hugin1/base_wx/ImageCache.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/ImageCache.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/base_wx/ImageCache.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -24,6 +24,7 @@
#ifndef _IMAGECACHE_H
#define _IMAGECACHE_H
+#include <hugin_shared.h>
#include <map>
#include <panoinc_WX.h>
#include <PT/RemappedPanoImage.h>
@@ -43,7 +44,7 @@
using HuginBase::ImageCache;
using HuginBase::SmallRemappedImageCache;
-wxImage imageCacheEntry2wxImage(ImageCache::EntryPtr e);
+WXIMPEX wxImage imageCacheEntry2wxImage(ImageCache::EntryPtr e);
#else
Modified: hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/base_wx/MyExternalCmdExecDialog.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -27,11 +27,13 @@
#ifndef _MYEXTERNALCMDEXECDIALOG__H
#define _MYEXTERNALCMDEXECDIALOG__H
+#include <hugin_shared.h>
+
const int HUGIN_EXIT_CODE_CANCELLED = -255;
class MyExternalCmdExecDialog;
class HuginPipedProcess;
-int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent, wxString title);
+WXIMPEX int MyExecuteCommandOnDialog(wxString command, wxString args, wxWindow* parent, wxString title);
//#define HUGIN_EXEC_LISTBOX 1
Modified: hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/base_wx/MyProgressDialog.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -24,6 +24,7 @@
#ifndef _MYPROGRESSDIALOG_H
#define _MYPROGRESSDIALOG_H
+#include <hugin_shared.h>
#include "panoinc.h"
#include "panoinc_WX.h"
@@ -31,7 +32,7 @@
-class ProgressReporterDialog : public utils::ProgressReporter, public wxProgressDialog
+class WXIMPEX ProgressReporterDialog : public utils::ProgressReporter, public wxProgressDialog
{
public:
ProgressReporterDialog(double maxProgress, const wxString& title, const wxString& message,
@@ -65,7 +66,7 @@
*
* Also allows cancellation
*/
-class MyProgressDialog : public wxProgressDialog, public utils::MultiProgressDisplay
+class WXIMPEX MyProgressDialog : public wxProgressDialog, public utils::MultiProgressDisplay
{
public:
/** ctor.
Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp
===================================================================
--- hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.cpp 2010-03-21 14:27:39 UTC (rev 5076)
@@ -27,6 +27,7 @@
#include <config.h>
#include "panoinc.h"
#include "panoinc_WX.h"
+#include "PTWXDlg.h"
extern "C" {
#include <pano13/filter.h>
Modified: hugin/trunk/src/hugin1/base_wx/PTWXDlg.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/PTWXDlg.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/base_wx/PTWXDlg.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -24,8 +24,10 @@
#ifndef _PTWXDLG_H
#define _PTWXDLG_H
-void registerPTWXDlgFcn(wxWindow *parent=NULL);
-void deregisterPTWXDlgFcn();
+#include <hugin_shared.h>
+WXIMPEX void registerPTWXDlgFcn(wxWindow *parent=NULL);
+WXIMPEX void deregisterPTWXDlgFcn();
+
#endif // _PTWXDLG_H
Modified: hugin/trunk/src/hugin1/base_wx/RunStitchPanel.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/RunStitchPanel.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/base_wx/RunStitchPanel.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -27,6 +27,7 @@
#ifndef RUN_STITCH_FRAME_H
#define RUN_STITCH_FRAME_H
+#include <hugin_shared.h>
#include <vector>
#include <set>
#include <functional>
@@ -39,7 +40,7 @@
#include "MyExternalCmdExecDialog.h"
-struct StitchProjectEntry
+struct WXIMPEX StitchProjectEntry
{
StitchProjectEntry(wxString script, wxString output)
: scriptFile(script), outputPrefix(output), finished(false),
@@ -53,7 +54,7 @@
bool error;
};
-class RunStitchPanel: public wxPanel
+class WXIMPEX RunStitchPanel: public wxPanel
{
public:
RunStitchPanel(wxWindow * parent);
Modified: hugin/trunk/src/hugin1/base_wx/huginConfig.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/huginConfig.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/base_wx/huginConfig.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -27,7 +27,7 @@
#ifndef _Hgn1_huginConfig_H
#define _Hgn1_huginConfig_H
-
+#include <hugin_shared.h>
#include <panoinc_WX.h>
#include "PT/Panorama.h"
@@ -37,7 +37,7 @@
struct PTPrograms : public HuginBase::PanoramaMakefileExport::PTPrograms {};
}
-PT::PTPrograms getPTProgramsConfig(wxString huginRoot, wxConfigBase * config);
+WXIMPEX PT::PTPrograms getPTProgramsConfig(wxString huginRoot, wxConfigBase * config);
/** get the path to the directory where the currently running executable is
* stored.
@@ -46,8 +46,8 @@
* Unix.
*
*/
-wxString getExePath(wxString argv0);
+WXIMPEX wxString getExePath(wxString argv0);
-void updateHuginConfig(wxConfigBase * config);
+WXIMPEX void updateHuginConfig(wxConfigBase * config);
#endif
Modified: hugin/trunk/src/hugin1/base_wx/platform.h
===================================================================
--- hugin/trunk/src/hugin1/base_wx/platform.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/base_wx/platform.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -27,6 +27,7 @@
#ifndef HUGIN1_BASE_PLATFORM_H
#define HUGIN1_BASE_PLATFORM_H
+#include <hugin_shared.h>
#include "panoinc_WX.h"
#include <config.h>
@@ -60,8 +61,8 @@
#endif //__WXMAC__
/** returns all invalid characters for the filename (mainly characters, which does not work with gnu make) */
-const wxString getInvalidCharacters();
+WXIMPEX const wxString getInvalidCharacters();
/** returns true, if the given strings contains invalid characters */
-bool containsInvalidCharacters(const wxString stringToTest);
+WXIMPEX bool containsInvalidCharacters(const wxString stringToTest);
#endif
Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp 2010-03-21 14:27:39 UTC (rev 5076)
@@ -31,7 +31,9 @@
#include <config.h>
+#if !defined Hugin_shared || !defined _WINDOWS
#define GLEW_STATIC
+#endif
#include <GL/glew.h>
#include "panoinc_WX.h"
Modified: hugin/trunk/src/hugin1/hugin/GLViewer.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/GLViewer.cpp 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/hugin/GLViewer.cpp 2010-03-21 14:27:39 UTC (rev 5076)
@@ -25,7 +25,9 @@
#include "panoinc.h"
#include <config.h>
+#if !defined Hugin_shared || !defined _WINDOWS
#define GLEW_STATIC
+#endif
#include <GL/glew.h>
#include <base_wx/platform.h>
#include <wx/settings.h>
Modified: hugin/trunk/src/hugin1/hugin/MeshManager.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/MeshManager.cpp 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/hugin/MeshManager.cpp 2010-03-21 14:27:39 UTC (rev 5076)
@@ -22,7 +22,9 @@
#include <wx/wx.h>
#include <wx/platform.h>
+#if !defined Hugin_shared || !defined _WINDOWS
#define GLEW_STATIC
+#endif
#include <GL/glew.h>
#ifdef __WXMAC__
Modified: hugin/trunk/src/hugin1/hugin/PreviewDifferenceTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewDifferenceTool.cpp 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/hugin/PreviewDifferenceTool.cpp 2010-03-21 14:27:39 UTC (rev 5076)
@@ -21,7 +21,9 @@
#include "PreviewDifferenceTool.h"
#include <config.h>
+#if !defined Hugin_shared || !defined _WINDOWS
#define GLEW_STATIC
+#endif
#include <GL/glew.h>
#include <wx/platform.h>
#ifdef __WXMAC__
Modified: hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/hugin/PreviewIdentifyTool.cpp 2010-03-21 14:27:39 UTC (rev 5076)
@@ -32,7 +32,9 @@
#include <wx/platform.h>
//multitexture feature requires glew on some systems
+#if !defined Hugin_shared || !defined _WINDOWS
#define GLEW_STATIC
+#endif
#include <GL/glew.h>
#ifdef __WXMAC__
Modified: hugin/trunk/src/hugin1/hugin/TextureManager.cpp
===================================================================
--- hugin/trunk/src/hugin1/hugin/TextureManager.cpp 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin1/hugin/TextureManager.cpp 2010-03-21 14:27:39 UTC (rev 5076)
@@ -41,7 +41,9 @@
// The OpenGL Extension wrangler libray will find extensions and the latest
// supported OpenGL version on all platforms.
+#if !defined Hugin_shared || !defined _WINDOWS
#define GLEW_STATIC
+#endif
#include <GL/glew.h>
#include <wx/platform.h>
Modified: hugin/trunk/src/hugin_base/CMakeLists.txt
===================================================================
--- hugin/trunk/src/hugin_base/CMakeLists.txt 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/CMakeLists.txt 2010-03-21 14:27:39 UTC (rev 5076)
@@ -65,6 +65,7 @@
SET(HUGIN_BASE_HEADER
algorithm/PanoramaAlgorithm.h
+algorithm/StitcherAlgorithm.h
algorithms/nona/NonaFileStitcher.h
algorithms/nona/NonaImageStitcher.h
algorithms/basic/CalculateCPStatistics.h
@@ -128,7 +129,11 @@
add_library(huginbase SHARED ${HUGIN_BASE_SRC} ${HUGIN_BASE_HEADER})
target_link_libraries(huginbase ${Boost_LIBRARIES})
set_target_properties(huginbase PROPERTIES VERSION ${HUGIN_LIB_VERSION})
- install(TARGETS huginbase DESTINATION ${LIBDIR})
+ IF(WIN32)
+ install(TARGETS huginbase RUNTIME DESTINATION ${BINDIR})
+ ELSE(WIN32)
+ install(TARGETS huginbase DESTINATION ${LIBDIR})
+ ENDIF(WIN32)
ELSE (${HUGIN_SHARED_LIBS})
add_library(huginbase STATIC ${HUGIN_BASE_SRC} ${HUGIN_BASE_HEADER})
ENDIF (${HUGIN_SHARED_LIBS})
@@ -138,4 +143,4 @@
TARGET_LINK_LIBRARIES(huginbase huginlevmar huginvigraimpex
${Boost_LIBRARIES} ${EXIV2_LIBRARIES} ${PANO_LIBRARIES}
${TIFF_LIBRARIES} ${LAPACK_LIBRARIES} ${GLEW_LIBRARIES}
- ${OPENGL_LIBRARIES})
+ ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
Modified: hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithm/PanoramaAlgorithm.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -31,6 +31,7 @@
#ifndef _ALGORITHM_PANORAMAALGORITHM_H
#define _ALGORITHM_PANORAMAALGORITHM_H
+#include <hugin_shared.h>
#include <appbase/ProgressDisplay.h>
@@ -42,7 +43,7 @@
/**
*
*/
- class PanoramaAlgorithm
+ class IMPEX PanoramaAlgorithm
{
protected:
@@ -114,7 +115,7 @@
/**
*
*/
- class TimeConsumingPanoramaAlgorithm : public PanoramaAlgorithm
+ class IMPEX TimeConsumingPanoramaAlgorithm : public PanoramaAlgorithm
{
protected:
Modified: hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithm/StitcherAlgorithm.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -35,6 +35,7 @@
#include <algorithm/PanoramaAlgorithm.h>
+#include <hugin_shared.h>
#include <vigra/impex.hxx>
#include <panodata/PanoramaData.h>
@@ -43,7 +44,7 @@
/// Just a conceptual base class...
- class StitcherAlgorithm : public TimeConsumingPanoramaAlgorithm
+ class IMPEX StitcherAlgorithm : public TimeConsumingPanoramaAlgorithm
{
public:
@@ -82,7 +83,7 @@
/// stitch to file output
- class ImageStitcherAlgorithm : public StitcherAlgorithm
+ class IMPEX ImageStitcherAlgorithm : public StitcherAlgorithm
{
public:
@@ -111,7 +112,7 @@
/// stitch to file output
- class FileOutputStitcherAlgorithm : public StitcherAlgorithm
+ class IMPEX FileOutputStitcherAlgorithm : public StitcherAlgorithm
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/basic/CalculateCPStatistics.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/basic/CalculateCPStatistics.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/basic/CalculateCPStatistics.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -26,6 +26,7 @@
#ifndef _BASICALGORITHMS_CALCULATECPSTSTISTICS_H
#define _BASICALGORITHMS_CALCULATECPSTSTISTICS_H
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
@@ -34,7 +35,7 @@
/// just some common implementation; probably not so useful
-class CalculateCPStatistics : public PanoramaAlgorithm
+class IMPEX CalculateCPStatistics : public PanoramaAlgorithm
{
protected:
@@ -94,7 +95,7 @@
-class CalculateCPStatisticsError : public CalculateCPStatistics
+class IMPEX CalculateCPStatisticsError : public CalculateCPStatistics
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/basic/CalculateMeanExposure.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/basic/CalculateMeanExposure.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/basic/CalculateMeanExposure.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -26,6 +26,7 @@
#ifndef _BASICALGORITHMS_CALCULATEMEANEXPOSURE_H
#define _BASICALGORITHMS_CALCULATEMEANEXPOSURE_H
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
@@ -33,7 +34,7 @@
namespace HuginBase {
-class CalculateMeanExposure : public PanoramaAlgorithm
+class IMPEX CalculateMeanExposure : public PanoramaAlgorithm
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalROI.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalROI.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalROI.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -26,6 +26,7 @@
#define _BASICALGORITHMS_CALCULATEOPTIMALROI_H
+#include <hugin_shared.h>
#include <panotools/PanoToolsInterface.h>
#include <algorithm/PanoramaAlgorithm.h>
@@ -36,7 +37,7 @@
namespace HuginBase {
-class CalculateOptimalROI : public PanoramaAlgorithm
+class IMPEX CalculateOptimalROI : public PanoramaAlgorithm
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalScale.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalScale.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/basic/CalculateOptimalScale.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -27,6 +27,7 @@
#ifndef _BASICALGORITHMS_CALCULATEOPTIMALSCALE_H
#define _BASICALGORITHMS_CALCULATEOPTIMALSCALE_H
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
#include <panodata/PanoramaData.h>
@@ -36,7 +37,7 @@
namespace HuginBase {
-class CalculateOptimalScale : public PanoramaAlgorithm
+class IMPEX CalculateOptimalScale : public PanoramaAlgorithm
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/basic/RotatePanorama.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/basic/RotatePanorama.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/basic/RotatePanorama.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -26,6 +26,7 @@
#ifndef _BASICALGORITHMS_ROTATEPANORAMA_H
#define _BASICALGORITHMS_ROTATEPANORAMA_H
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
#include <panodata/PanoramaData.h>
@@ -34,7 +35,7 @@
namespace HuginBase {
-class RotatePanorama : public PanoramaAlgorithm
+class IMPEX RotatePanorama : public PanoramaAlgorithm
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/basic/StraightenPanorama.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -26,13 +26,14 @@
#ifndef _BASICALGORITHMS_STRAIGHTENPANORAMA_H
#define _BASICALGORITHMS_STRAIGHTENPANORAMA_H
+#include <hugin_shared.h>
#include <algorithms/basic/RotatePanorama.h>
namespace HuginBase {
-class StraightenPanorama : public RotatePanorama
+class IMPEX StraightenPanorama : public RotatePanorama
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/control_points/CleanCP.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/control_points/CleanCP.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/control_points/CleanCP.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -30,6 +30,7 @@
#ifndef _CLEANCP_H
#define _CLEANCP_H
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
#include <panodata/Panorama.h>
#include <algorithms/optimizer/PTOptimizer.h>
@@ -41,12 +42,12 @@
@param pano panorama which should be used
@param n determines, how big the deviation from mean should be to determine wrong control points, default 2.0
@return set which contains control points with error > mean+n*sigma */
-UIntSet getCPoutsideLimit_pair(Panorama pano, double n=2.0);
+IMPEX UIntSet getCPoutsideLimit_pair(Panorama pano, double n=2.0);
/** optimises the whole panorama and removes all control points with error > mean+n*sigma
@param pano panorama which should be used
@param n determines, how big the deviation from mean should be to determine wrong control points, default 2.0
@return set which contains control points with error > mean+n*sigma */
-UIntSet getCPoutsideLimit(Panorama pano, double n=2.0);
+IMPEX UIntSet getCPoutsideLimit(Panorama pano, double n=2.0);
} // namespace
#endif // _H
Modified: hugin/trunk/src/hugin_base/algorithms/nona/CalculateFOV.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/nona/CalculateFOV.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/nona/CalculateFOV.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -26,6 +26,7 @@
#ifndef _BASICALGORITHMS_CALCULATECFOV_H
#define _BASICALGORITHMS_CALCULATECFOV_H
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
#include <panodata/PanoramaData.h>
@@ -34,7 +35,7 @@
namespace HuginBase {
-class CalculateFOV : public PanoramaAlgorithm
+class IMPEX CalculateFOV : public PanoramaAlgorithm
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/nona/CenterHorizontally.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/nona/CenterHorizontally.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/nona/CenterHorizontally.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -26,6 +26,7 @@
#ifndef _CENTERHORIZONTALLY_H
#define _CENTERHORIZONTALLY_H
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
@@ -33,7 +34,7 @@
namespace HuginBase {
-class CenterHorizontally : public PanoramaAlgorithm
+class IMPEX CenterHorizontally : public PanoramaAlgorithm
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/nona/ComputeImageROI.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/nona/ComputeImageROI.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/nona/ComputeImageROI.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -26,6 +26,7 @@
#ifndef _COMPUTE_IMAGE_ROI_H
#define _COMPUTE_IMAGE_ROI_H
+#include <hugin_shared.h>
#include <vigra/diff2d.hxx>
#include <algorithm/PanoramaAlgorithm.h>
#include <panodata/Panorama.h>
@@ -35,9 +36,9 @@
namespace HuginBase {
-vigra::Rect2D estimateOutputROI(const PanoramaData & pano, const PanoramaOptions & opts, unsigned i);
+IMPEX vigra::Rect2D estimateOutputROI(const PanoramaData & pano, const PanoramaOptions & opts, unsigned i);
-class ComputeImageROI : public PanoramaAlgorithm
+class IMPEX ComputeImageROI : public PanoramaAlgorithm
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/nona/FitPanorama.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/nona/FitPanorama.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/nona/FitPanorama.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -26,6 +26,7 @@
#ifndef _FITPANORAMA_H
#define _FITPANORAMA_H
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
@@ -33,7 +34,7 @@
namespace HuginBase {
-class CalculateFitPanorama : public PanoramaAlgorithm
+class IMPEX CalculateFitPanorama : public PanoramaAlgorithm
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/nona/NonaFileStitcher.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -31,6 +31,7 @@
#ifndef _NONAFILESTITCHER_H
#define _NONAFILESTITCHER_H
+#include <hugin_shared.h>
#include <algorithm/StitcherAlgorithm.h>
namespace HuginBase {
@@ -39,7 +40,7 @@
/** This class will use the stitchPanorama function of nona. The filename
* may be automatically modified preserving only the basename.
*/
- class NonaFileOutputStitcher : public FileOutputStitcherAlgorithm
+ class IMPEX NonaFileOutputStitcher : public FileOutputStitcherAlgorithm
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/optimizer/ImageGraph.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/optimizer/ImageGraph.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/optimizer/ImageGraph.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -24,6 +24,8 @@
#ifndef _PANODATA_IMAGEGRAPH_H
#define _PANODATA_IMAGEGRAPH_H
+#include <hugin_shared.h>
+
#ifdef MAC_OS_X
// In the case boost got error with macro "check()", uncomment following two lines.
//#include <AssertMacros.h>
@@ -57,9 +59,9 @@
* more control points
*
*/
-void createCPGraph(const PanoramaData& pano, CPGraph & graph);
+IMPEX void createCPGraph(const PanoramaData& pano, CPGraph & graph);
-int findCPComponents(const CPGraph & graph,
+IMPEX int findCPComponents(const CPGraph & graph,
CPComponents & comp);
Modified: hugin/trunk/src/hugin_base/algorithms/optimizer/PTOptimizer.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/optimizer/PTOptimizer.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/optimizer/PTOptimizer.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -30,6 +30,7 @@
#include <algorithm/PanoramaAlgorithm.h>
+#include <hugin_shared.h>
#include <set>
#include <boost/graph/breadth_first_search.hpp>
#include <panodata/PanoramaData.h>
@@ -38,7 +39,7 @@
///
- class PTOptimizer : public PanoramaAlgorithm
+ class IMPEX PTOptimizer : public PanoramaAlgorithm
{
public:
@@ -63,7 +64,7 @@
///
- class AutoOptimise : public PTOptimizer
+ class IMPEX AutoOptimise : public PTOptimizer
{
public:
@@ -119,7 +120,7 @@
};
///
- class SmartOptimizerStub
+ class IMPEX SmartOptimizerStub
{
public:
///
@@ -141,7 +142,7 @@
static OptimizeVector createOptVars(const PanoramaData& optPano, int mode, unsigned anchorImg=0);
};
- class SmartOptimise : public PTOptimizer, protected SmartOptimizerStub
+ class IMPEX SmartOptimise : public PTOptimizer, protected SmartOptimizerStub
{
public:
Modified: hugin/trunk/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -24,6 +24,7 @@
#ifndef _PHOTOMETRIC_OPTIMIZER_H_
#define _PHOTOMETRIC_OPTIMIZER_H_
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
#include <algorithms/optimizer/PTOptimizer.h>
@@ -35,7 +36,7 @@
namespace HuginBase
{
- class PhotometricOptimizer : public TimeConsumingPanoramaAlgorithm
+ class IMPEX PhotometricOptimizer : public TimeConsumingPanoramaAlgorithm
{
public:
@@ -130,7 +131,7 @@
- class SmartPhotometricOptimizer : public PhotometricOptimizer, protected SmartOptimizerStub
+ class IMPEX SmartPhotometricOptimizer : public PhotometricOptimizer, protected SmartOptimizerStub
{
public:
/// local optimize definition.
Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -25,6 +25,7 @@
#ifndef _BASICALGORITHM_PANORAMAMAKEFILEEXPORT_H
#define _BASICALGORITHM_PANORAMAMAKEFILEEXPORT_H
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
#include <panodata/PanoramaData.h>
@@ -34,11 +35,11 @@
namespace HuginBase {
///
-std::vector<UIntSet> getHDRStacks(const PanoramaData & pano, UIntSet allImgs);
-std::vector<UIntSet> getExposureLayers(const PanoramaData & pano, UIntSet allImgs);
-UIntSet getImagesinROI (const PanoramaData& pano, const UIntSet activeImages);
+IMPEX std::vector<UIntSet> getHDRStacks(const PanoramaData & pano, UIntSet allImgs);
+IMPEX std::vector<UIntSet> getExposureLayers(const PanoramaData & pano, UIntSet allImgs);
+IMPEX UIntSet getImagesinROI (const PanoramaData& pano, const UIntSet activeImages);
-class PanoramaMakefileExport : public PanoramaAlgorithm
+class IMPEX PanoramaMakefileExport : public PanoramaAlgorithm
{
public:
///
Modified: hugin/trunk/src/hugin_base/algorithms/point_sampler/PointSampler.h
===================================================================
--- hugin/trunk/src/hugin_base/algorithms/point_sampler/PointSampler.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/algorithms/point_sampler/PointSampler.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -26,6 +26,7 @@
#include <ctime>
+#include <hugin_shared.h>
#include <algorithm/PanoramaAlgorithm.h>
#include <boost/random.hpp>
@@ -38,7 +39,7 @@
namespace HuginBase
{
- class PointSampler : public TimeConsumingPanoramaAlgorithm
+ class IMPEX PointSampler : public TimeConsumingPanoramaAlgorithm
{
protected:
///
Modified: hugin/trunk/src/hugin_base/appbase/DocumentData.h
===================================================================
--- hugin/trunk/src/hugin_base/appbase/DocumentData.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ hugin/trunk/src/hugin_base/appbase/DocumentData.h 2010-03-21 14:27:39 UTC (rev 5076)
@@ -32,14 +32,14 @@
#define _APPBASE_DOCUMENTDATA_H
#include <string>
+#include <hugin_shared.h>
-
namespace AppBase {
/**
*
*/
-class DocumentData
+class IMPEX DocumentData
{
public:
Modified: hugin/trunk/src/hugin_base/appbase/ProgressDisplay.h
===================================================================
--- hugin/trunk/src/hugin_base/appbase/ProgressDisplay.h 2010-03-20 19:11:46 UTC (rev 5075)
+++ ...
[truncated message content] |