[trunk] FolderReorgProposal task: Fix Viewer

Update issue 177
This commit is contained in:
Mathieu Malaterre 2012-09-28 08:59:10 +00:00
parent f71af2a2ef
commit a4fa18e92d
6 changed files with 14 additions and 8 deletions

View File

@ -17,6 +17,5 @@ if(BUILD_JP3D)
add_subdirectory(jp3d) add_subdirectory(jp3d)
endif() endif()
if(BUILD_VIEWER) # wx apps:
add_subdirectory(wx) add_subdirectory(wx)
endif()

View File

@ -0,0 +1,4 @@
#
if(BUILD_VIEWER)
add_subdirectory(OPJViewer)
endif()

View File

@ -6,6 +6,9 @@ include(${wxWidgets_USE_FILE})
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR}/../..
${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..
${OPENJPEG_SOURCE_DIR}/src/lib
${OPENJPEG_SOURCE_DIR}/src/bin
${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
) )
# original flags: # original flags:
@ -19,7 +22,7 @@ set(OPJV_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/source/OPJDialogs.cpp ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJDialogs.cpp
${CMAKE_CURRENT_SOURCE_DIR}/source/OPJThreads.cpp ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJThreads.cpp
${CMAKE_CURRENT_SOURCE_DIR}/source/OPJAbout.cpp ${CMAKE_CURRENT_SOURCE_DIR}/source/OPJAbout.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../codec/index.c ${OPENJPEG_SOURCE_DIR}/src/bin/jp2/index.c
) )
add_executable(opjviewer ${OPJV_SRCS}) add_executable(opjviewer ${OPJV_SRCS})
target_link_libraries(opjviewer ${wxWidgets_LIBRARIES} openjpeg) target_link_libraries(opjviewer ${wxWidgets_LIBRARIES} openjpeg)

View File

@ -101,7 +101,7 @@
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/artprov.h" #include "wx/artprov.h"
#include "libopenjpeg/openjpeg.h" #include "openjp2/openjpeg.h"
//#include "imagj2k.h" //#include "imagj2k.h"
//#include "imagjp2.h" //#include "imagjp2.h"

View File

@ -51,7 +51,7 @@
#include "wx/module.h" #include "wx/module.h"
#endif #endif
#include "libopenjpeg/openjpeg.h" #include "openjp2/openjpeg.h"
#include "wx/filefn.h" #include "wx/filefn.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"

View File

@ -44,8 +44,8 @@
#if wxUSE_LIBOPENJPEG #if wxUSE_LIBOPENJPEG
#include "wx/image.h" #include "wx/image.h"
#include "libopenjpeg/openjpeg.h" #include "openjp2/openjpeg.h"
#include "codec/index.h" #include "jp2/index.h"
#define wxBITMAP_TYPE_JPEG2000 50 #define wxBITMAP_TYPE_JPEG2000 50