Commit 3198ca41 authored by Markus Koschany's avatar Markus Koschany

Imported Upstream version 1.9.3

parent 9bc641c7
OPEN YAHTZEE CHANGELOG
===========================
This file lists the changes betweeen Open Yahtzee releases. For a
complete list of changes see the SVN changelog of the project.
complete list of changes see the git log of the project.
Open Yahtzee 1.9.3:
-------------------
- wxWidgets-3.0 compatability.
- Windows compatability fixes.
- GUI layout fixes for wxWidgets-3.0.
Open Yahtzee 1.9.2:
-------------------
......
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<WXWIN>C:\wxWidgets-3.0.2</WXWIN>
<BOOST_ROOT>C:\boost_1_60_0</BOOST_ROOT>
</PropertyGroup>
<ItemDefinitionGroup />
<ItemGroup>
<BuildMacro Include="WXWIN">
<Value>$(WXWIN)</Value>
</BuildMacro>
<BuildMacro Include="BOOST_ROOT">
<Value>$(BOOST_ROOT)</Value>
</BuildMacro>
</ItemGroup>
</Project>
Open Yahtzee Readme
===================
For installation instructions and how to play,
see the [Open Yahtzee homepage](http://www.openyahtzee.org/).
Authors
-------
See `AUTHORS` file.
License
-------
Open Yahtzee - A free implementation of the classic dice game Yahtzee
Copyright (C) 2006-2016 Guy Rutenberg
This program 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 2 of the License, or
(at your option) any later version.
This program 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 this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
This diff is collapsed.
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program 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 2, or (at your option)
# any later version.
#
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
# We need space, tab and new line, in precisely that order. Quoting is
# there to prevent tools from complaining about whitespace usage.
IFS=" "" $nl"
file_conv=
# func_file_conv build_file lazy
# Convert a $build file to $host form and store it in $file
# Currently only supports Windows hosts. If the determined conversion
# type is listed in (the comma separated) LAZY, no conversion will
# take place.
func_file_conv ()
{
file=$1
case $file in
/ | /[!/]*) # absolute file, and not a UNC file
if test -z "$file_conv"; then
# lazily determine how to convert abs files
case `uname -s` in
MINGW*)
file_conv=mingw
;;
CYGWIN*)
file_conv=cygwin
;;
*)
file_conv=wine
;;
esac
fi
case $file_conv/,$2, in
*,$file_conv,*)
;;
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
file=`winepath -w "$file" || echo "$file"`
;;
esac
;;
esac
}
# func_cl_dashL linkdir
# Make cl look for libraries in LINKDIR
func_cl_dashL ()
{
func_file_conv "$1"
if test -z "$lib_path"; then
lib_path=$file
else
lib_path="$lib_path;$file"
fi
linker_opts="$linker_opts -LIBPATH:$file"
}
# func_cl_dashl library
# Do a library search-path lookup for cl
func_cl_dashl ()
{
lib=$1
found=no
save_IFS=$IFS
IFS=';'
for dir in $lib_path $LIB
do
IFS=$save_IFS
if $shared && test -f "$dir/$lib.dll.lib"; then
found=yes
lib=$dir/$lib.dll.lib
break
fi
if test -f "$dir/$lib.lib"; then
found=yes
lib=$dir/$lib.lib
break
fi
if test -f "$dir/lib$lib.a"; then
found=yes
lib=$dir/lib$lib.a
break
fi
done
IFS=$save_IFS
if test "$found" != yes; then
lib=$lib.lib
fi
}
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
{
# Assume a capable shell
lib_path=
shared=:
linker_opts=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
*.o | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
;;
*)
func_file_conv "$2"
set x "$@" -Fe"$file"
shift
;;
esac
;;
-I)
eat=1
func_file_conv "$2" mingw
set x "$@" -I"$file"
shift
;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
-l)
eat=1
func_cl_dashl "$2"
set x "$@" "$lib"
shift
;;
-l*)
func_cl_dashl "${1#-l}"
set x "$@" "$lib"
shift
;;
-L)
eat=1
func_cl_dashL "$2"
;;
-L*)
func_cl_dashL "${1#-L}"
;;
-static)
shared=false
;;
-Wl,*)
arg=${1#-Wl,}
save_ifs="$IFS"; IFS=','
for flag in $arg; do
IFS="$save_ifs"
linker_opts="$linker_opts $flag"
done
IFS="$save_ifs"
;;
-Xlinker)
eat=1
linker_opts="$linker_opts $2"
;;
-*)
set x "$@" "$1"
shift
;;
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
func_file_conv "$1"
set x "$@" -Tp"$file"
shift
;;
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
func_file_conv "$1" mingw
set x "$@" "$file"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -n "$linker_opts"; then
linker_opts="-link$linker_opts"
fi
exec "$@" $linker_opts
exit 1
}
eat=
case $1 in
'')
echo "$0: No command. Try '$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand '-c -o'.
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
ofile=
cfile=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
# So we strip '-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -z "$ofile" || test -z "$cfile"; then
# If no '-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# '.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
This diff is collapsed.
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* define if the Boost library is available */
#define HAVE_BOOST /**/
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
......@@ -47,7 +50,7 @@
#define PACKAGE_NAME "Open Yahtzee"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "Open Yahtzee 1.9.2"
#define PACKAGE_STRING "Open Yahtzee 1.9.3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "openyahtzee"
......@@ -56,13 +59,13 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "1.9.2"
#define PACKAGE_VERSION "1.9.3"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
#define VERSION "1.9.2"
#define VERSION "1.9.3"
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
......
/* config.h.in. Generated from configure.ac by autoheader. */
/* define if the Boost library is available */
#undef HAVE_BOOST
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
......
This diff is collapsed.
This diff is collapsed.
AC_INIT([Open Yahtzee],[1.9.2],[guyrutenberg@gmail.com],[openyahtzee])
AC_INIT([Open Yahtzee],[1.9.3],[guyrutenberg@gmail.com],[openyahtzee])
AM_INIT_AUTOMAKE([-Wall -Werror])
AC_CONFIG_SRCDIR([src/openyahtzee.cpp])
......@@ -6,6 +6,7 @@ AC_CONFIG_HEADER([config.h])
m4_include(macros/wxwin.m4)
m4_include(macros/ax_check_compile_flag.m4)
m4_include(macros/ax_boost_base.m4)
# Checks for programs.
AC_PROG_CXX
......@@ -37,6 +38,8 @@ AC_MSG_ERROR([
])
fi
AX_BOOST_BASE([1.32])
AC_CONFIG_FILES([Makefile
man/Makefile
......
This diff is collapsed.
This diff is collapsed.
......@@ -8,3 +8,4 @@ TryExec=openyahtzee
Icon=openyahtzee
Terminal=false
Categories=Game;BoardGame;
Keywords=dice;board;yahtzee;

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openyahtzee", "openyahtzee.vcproj", "{751F1BED-0ADC-47C4-8424-42745E9CDF2C}"
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openyahtzee", "openyahtzee.vcxproj", "{751F1BED-0ADC-47C4-8424-42745E9CDF2C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/***************************************************************************
* Copyright (C) 2006-2009 by Guy Rutenberg *
* Copyright (C) 2006-2016 by Guy Rutenberg *
* guyrutenberg@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
......@@ -26,11 +26,11 @@
#ifndef OPENYAHTZEE_MAIN_FRAME_INC
#define OPENYAHTZEE_MAIN_FRAME_INC
#include <memory>
#include <boost/scoped_ptr.hpp>
#include "ScoreDice.h"
#include "configuration.h"
#include "statistics.h"
#include <memory>
#include <boost/scoped_ptr.hpp>
#include <wx/wx.h>
namespace main_frame {
......@@ -45,7 +45,7 @@ class MainFrame : public wxFrame
{
public:
// Constructor
MainFrame(const wxString& title, const wxSize& size, long style);
MainFrame(const wxString& title, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE ^ wxRESIZE_BORDER );
~MainFrame();
// Event handlers
......@@ -54,7 +54,6 @@ public:
void OnNewGame (wxCommandEvent& event);
void OnUndo (wxCommandEvent& event);
void OnShowHighscore (wxCommandEvent& event);
void OnStatistics (wxCommandEvent& event);
void OnSettings (wxCommandEvent& event);
void OnSendComment (wxCommandEvent& event);
void OnHelpMenuLink (wxCommandEvent& event);
......@@ -84,7 +83,6 @@ public:
ScoreDice m_score_dice;
boost::scoped_ptr<configuration::Configuration> m_config;
boost::scoped_ptr<statistics::Statistics> m_stats;
private:
void ClearDiceHash();
......@@ -118,6 +116,7 @@ private:
wxStaticBoxSizer *uppersection, *lowersection;
wxBoxSizer *sectionsSizer;
wxBoxSizer *diceSizer;
//pointers to hold bitmap data for the dices
wxBitmap *bitmap_dice[6];
......@@ -151,7 +150,6 @@ private:
enum {
ID_PANEL,
ID_SHOWHIGHSCORE,
ID_STATISTICS,
ID_SETTINGS,
ID_THEMES,
ID_HOWTOPLAY,
......
......@@ -39,8 +39,9 @@ noinst_HEADERS = \
statistics_dialog.h \
utility.h \
wxDynamicBitmap.h \
../openyahtzee.vcproj \
../openyahtzee.vcxproj \
../openyahtzee.sln \
../PropertySheet.props \
openyahtzee.ico \
openyahtzee.rc
......
This diff is collapsed.
/***************************************************************************
* Copyright (C) 2006-2009 by Guy Rutenberg *
* Copyright (C) 2006-2016 by Guy Rutenberg *
* guyrutenberg@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
......@@ -30,8 +30,8 @@ path prefix and datadir path accordingly.
* If PORTABLE is defined, Open Yahtzee will be compiled for the Portable Edition. Add "-DPORTABLE" to the CXXFLAGS when compiling.
*/
#include "wx/wx.h"
#include "MainFrame.h"
#include <wx/wx.h>
// #ifdef WIN32
// #include openyahtzee.rc
// #endif
......@@ -57,7 +57,7 @@ bool MyApp::OnInit()
::wxInitAllImageHandlers();
// Create the main application window
main_frame::MainFrame *frame = new main_frame::MainFrame(wxT("Open Yahtzee"), wxDefaultSize, wxDEFAULT_FRAME_STYLE);
main_frame::MainFrame *frame = new main_frame::MainFrame(wxT("Open Yahtzee"));
//Center the frame and show it
frame->Centre(true);
......
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