Commit aa16af48 authored by Innocent De Marchi's avatar Innocent De Marchi

Update debian branch.

parent 34fd98d2
......@@ -59,21 +59,29 @@ SET(CMAKE_INSTALL_PREFIX /$(CURDIR)/usr)
# this command finds Qt4 libraries and sets all required variables
# note that it's Qt4, not QT4 or qt4
FIND_PACKAGE( Qt4 REQUIRED )
find_package(Qt5Widgets)
#find_package(Qt5Declarative)
# The Qt5Widgets_INCLUDES also includes the include directories for
# dependencies QtCore and QtGui
include_directories(${Qt5Widgets_INCLUDES})
# We need add -DQT_WIDGETS_LIB when using QtWidgets in Qt 5.
add_definitions(${Qt5Widgets_DEFINITIONS})
# add some useful macros and variables
# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script)
INCLUDE( ${QT_USE_FILE} )
#INCLUDE( ${QT_USE_FILE} )
# this command will generate rules that will run rcc on all files from glpeces_RCS
# in result glpeces_RC_SRCS variable will contain paths to files produced by rcc
#QT4_ADD_RESOURCES( glpeces_RC_SRCS ${glpeces_RCS} )
# this will run uic on .ui files:
QT4_WRAP_UI( glpeces_UI_HDRS ${glpeces_UIS} )
QT5_WRAP_UI( glpeces_UI_HDRS ${glpeces_UIS} )
# and finally this will run moc:
QT4_WRAP_CPP( glpeces_MOC_SRCS ${glpeces_MOC_HDRS} )
QT5_WRAP_CPP( glpeces_MOC_SRCS ${glpeces_MOC_HDRS} )
# we need this to be able to include headers produced by uic in our code
# (CMAKE_BINARY_DIR holds a path to the build directory, while INCLUDE_DIRECTORIES() works just like INCLUDEPATH from qmake)
......@@ -86,9 +94,11 @@ SET(CMAKE_INSTALL_PREFIX /$(CURDIR)/usr)
# last thing we have to do is to tell CMake what libraries our executable needs,
# luckily FIND_PACKAGE prepared QT_LIBRARIES variable for us:
TARGET_LINK_LIBRARIES( glpeces ${QT_LIBRARIES}
${QT_QTMAIN_LIBRARY}
${QT_QTTEST_LIBRARY})
#TARGET_LINK_LIBRARIES( glpeces ${QT_LIBRARIES}
# ${QT_QTMAIN_LIBRARY}
# ${QT_QTTEST_LIBRARY})
target_link_libraries(glpeces ${Qt5Widgets_LIBRARIES})
# install executable and translation files
install_targets(/games glpeces)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
News in 5.2 version
- One new tangram game (hexagonal)
created by I. De Marchi.
- More 7,000 new shapes to play (31,610 in total).
- Random generation of new shapes
(not for all tangram game).
- More faster search for similar shapes
(Required human inspection).
- Add the glpeces.appdata.xml description file.
- Migrated to Qt 5.
News in 5.1 version (March, 2015)
- Add cmake build system.
......
Peces (Tangram game)
Copyright: this software is copyright 2000-2015 by Innocent De Marchi
Copyright: this software is copyright 2000-2016 by Innocent De Marchi
<tangram.peces@gmail.com>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -387,4 +387,7 @@ Auto-2.19
1 1 0
Auto-2.20
58 1 148.757 257.769 2.35619 0 2 264.99 138.051 1.5708 0 2 206.912 167.09 4.71239 0 2 335.182 169.43 4.71239 0 3 86.9998 199.851 5.49779 0 13 241.189 226.85 0.785398 0 15 235.517 65.25 3.92699 0 26 126.821 29.1119 2.35619 0 96 323.067 123.532 3.14159 0 96 374.582 121.662 2.35619 0 97 359.074 286.701 3.14159 0 97 148.756 76.3826 3.14159 0
1 1 0
\ No newline at end of file
1 1 0
Auto-2.1765131763
58 1 279.018 171.813 -2.98023e-07 0 2 41.0122 240.796 0.785398 0 2 119.518 157.314 3.14159 0 2 206.518 157.314 3.14159 0 3 90.5181 215.314 3.92699 0 13 327.795 246.073 0.785398 0 15 257.268 106.563 3.92699 0 26 399.566 235.82 3.14159 0 96 158.771 148.82 0.785398 0 96 41.0122 189.53 2.35619 0 97 427.762 84.5877 0.785398 0 97 381.623 130.726 3.92699 0
1 1 0
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -495,4 +495,7 @@ Auto-2.12
1 1 0
Auto-2.13
58 79 346.419 136.736 1.8326 0 79 139.223 140.919 0.785403 0 80 199.08 111.862 3.92699 0 80 72.7769 145.723 1.8326 0 81 293.995 71.4679 1.22173 0 82 92.7054 257.211 -0.663224 0 83 205.588 48.518 2.35619 0 84 172.108 195.379 3.33357 0 84 315.144 167.78 -2.35619 0
1 1 0
Auto-2.00
58 79 152.25 163.246 3.14159 0 79 217.501 200.918 3.14159 0 80 87.0002 150.689 4.18879 0 80 304.5 75.3442 -1.0472 0 81 101.501 251.148 1.5708 0 82 268.25 138.131 -0.523599 0 83 217.501 251.147 3.14159 0 84 190.313 141.27 1.0472 0 84 43.5 94.1811 3.14159 0
1 1 0
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -19,7 +19,7 @@
programa&nbsp;Peces son:</p>
<p>* Trenta-tres modalitats de joc, sis de les quals inventades per
<p>* 40 modalitats de joc, set de les quals inventades per
l'autor del programa.</p><p>* Quatre <a href="Nivells.htm">nivells</a>
de dificultat de joc.</p>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
No preview for this file type
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment