Attachment #490936 for bug #269110

Lines 29-35 Link Here

(-)old/CMakeLists.txt (-2 / +2 lines)
29	endif()	29	endif()
30	elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)	30	elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
31	# Update if necessary	31	# Update if necessary
32	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")	32	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic -std=c++11 -fPIC")
33	endif()	33	endif()
34		34
35	if (NOT DEFINED GUI)	35	if (NOT DEFINED GUI)
Lines 323-329 Link Here
323	message("Will make CR3/WX")	323	message("Will make CR3/WX")
324	ADD_DEFINITIONS( ${DESKTOP_DEFS} -DCR_WX_SUPPORT=1 )	324	ADD_DEFINITIONS( ${DESKTOP_DEFS} -DCR_WX_SUPPORT=1 )
325	SET(wxWidgets_USE_LIBS base core )	325	SET(wxWidgets_USE_LIBS base core )
326	FIND_PACKAGE(wxWidgets)	326	FIND_PACKAGE(wxWidgets 2.8)
327	IF (wxWidgets_FOUND)	327	IF (wxWidgets_FOUND)
328	INCLUDE(${wxWidgets_USE_FILE})	328	INCLUDE(${wxWidgets_USE_FILE})
329	include_directories( ${wxWidgets_INCLUDE_DIRS} )	329	include_directories( ${wxWidgets_INCLUDE_DIRS} )

Lines 173-179 Link Here

(-)old/cr3qt/CMakeLists.txt (-1 / +5 lines)
173	SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} )	173	SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} )
174	#${QT_LIBRARIES}	174	#${QT_LIBRARIES}
175	ELSEIF (UNIX)	175	ELSEIF (UNIX)
176	SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )	176	IF( ${GUI} STREQUAL QT )
		177	SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
		178	ELSE()
		179	SET (EXTRA_LIBS fontconfig ${STD_LIBS} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
		180	ENDIF()
177	ELSE()	181	ELSE()
178	SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} )	182	SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} )
179	ENDIF(MAC)	183	ENDIF(MAC)

Lines 10-16 Link Here

(-)old/cr3wx/CMakeLists.txt (-1 / +1 lines)
10	)	10	)
11	LINK_DIRECTORIES(${wxWidgets_LIBRARY_DIRS})	11	LINK_DIRECTORIES(${wxWidgets_LIBRARY_DIRS})
12	ADD_EXECUTABLE(cr3 ${CR3_SOURCES})	12	ADD_EXECUTABLE(cr3 ${CR3_SOURCES})
13	SET (EXTRA_LIBS ${wxWidgets_LIBRARIES} ${STD_LIBS})	13	SET (EXTRA_LIBS ${wxWidgets_LIBRARIES} fontconfig ${STD_LIBS})
14	TARGET_LINK_LIBRARIES(cr3 crengine tinydict ${EXTRA_LIBS})	14	TARGET_LINK_LIBRARIES(cr3 crengine tinydict ${EXTRA_LIBS})
15		15
16	IF (UNIX)	16	IF (UNIX)

Lines 1-2 Link Here

(-)a/crengine/include/cr3version.h (-4 / +4 lines)
1	#define CR_ENGINE_VERSION "3.1.2-52"	1	#define CR_ENGINE_VERSION "3.1.2-71"
2	#define CR_ENGINE_BUILD_DATE "2014-11-19"	2	#define CR_ENGINE_BUILD_DATE "2015-07-02"
3	-- a/cr3qt/src/aboutdlg.ui	3	++ b/cr3qt/src/aboutdlg.ui
Line 59 Link Here
59	<string notr="true">(c) 1998-2010 Vadim Lopatin</string>	59	<string notr="true">(c) 1998-2015 Vadim Lopatin</string>

Lines 1479-1485 Link Here

(-)old/cr3wx/src/cr3.cpp (-1 / +1 lines)
1479	void	1479	void
1480	cr3Frame::OnAbout( wxCommandEvent& WXUNUSED( event ) )	1480	cr3Frame::OnAbout( wxCommandEvent& WXUNUSED( event ) )
1481	{	1481	{
1482	wxMessageBox( wxT( "Cool Reader " wxT(CR3_VERSION) wxT("\n(c) 1998-2007 Vadim Lopatin\nwxWidgets version\n") )	1482	wxMessageBox( wxT( "Cool Reader " wxT(CR3_VERSION) wxT("\n(c) 1998-2015 Vadim Lopatin\nwxWidgets version\n") )
1483	wxT("\nBased on CREngine library " wxT(CR_ENGINE_VERSION) )	1483	wxT("\nBased on CREngine library " wxT(CR_ENGINE_VERSION) )
1484	wxT("\nThird party libraries used:")	1484	wxT("\nThird party libraries used:")
1485	wxT("\nzlib, libpng, libjpeg, freetype2,")	1485	wxT("\nzlib, libpng, libjpeg, freetype2,")

Return to bug 269110