mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Removed DECLARE_TYPEOF2; replaced with double-parenthesized macro calls. (GCC doesn't accept the other way in all cases.. I don't know whether MSW accepts this way.) Fixed a few resource names.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@209 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
@@ -0,0 +1,20 @@
|
||||
rm Makefile.am;
|
||||
echo "
|
||||
#+----------------------------------------------------------------------------+
|
||||
#| Description: Magic Set Editor - Program to make Magic (tm) cards |
|
||||
#| Copyright: (C) 2001 - 2007 Twan van Laarhoven |
|
||||
#| License: GNU General Public License 2 or later (see file COPYING) |
|
||||
#+----------------------------------------------------------------------------+
|
||||
|
||||
# This flag allows us to use subdirectories:
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
bin_PROGRAMS = magicseteditor
|
||||
AM_CXXFLAGS = @WX_CXXFLAGS@ -DUNICODE -I . -Wall
|
||||
AM_LDFLAGS = @WX_LIBS@
|
||||
|
||||
magicseteditor_SOURCES =
|
||||
|
||||
# The script used to generate is MakeAM. " | cat > Makefile.am;
|
||||
|
||||
find . -name *.cpp | sed "s/\./magicseteditor_SOURCES += ./" | cat >> Makefile.am;
|
||||
+93
-94
@@ -1,3 +1,4 @@
|
||||
|
||||
#+----------------------------------------------------------------------------+
|
||||
#| Description: Magic Set Editor - Program to make Magic (tm) cards |
|
||||
#| Copyright: (C) 2001 - 2007 Twan van Laarhoven |
|
||||
@@ -11,135 +12,133 @@ bin_PROGRAMS = magicseteditor
|
||||
AM_CXXFLAGS = @WX_CXXFLAGS@ -DUNICODE -I . -Wall
|
||||
AM_LDFLAGS = @WX_LIBS@
|
||||
|
||||
magicseteditor_SOURCES =
|
||||
|
||||
# List of source files, generated using:
|
||||
# find . -name *.cpp | sed "s/\./magicseteditor_SOURCES += ./"
|
||||
magicseteditor_SOURCES =
|
||||
|
||||
# The script used to generate is MakeAM.
|
||||
magicseteditor_SOURCES += ./src/render/text/viewer.cpp
|
||||
magicseteditor_SOURCES += ./src/render/text/compound.cpp
|
||||
magicseteditor_SOURCES += ./src/render/text/symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/render/text/font.cpp
|
||||
magicseteditor_SOURCES += ./src/render/text/element.cpp
|
||||
magicseteditor_SOURCES += ./src/render/symbol/viewer.cpp
|
||||
magicseteditor_SOURCES += ./src/render/symbol/filter.cpp
|
||||
magicseteditor_SOURCES += ./src/render/card/viewer.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/color.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/viewer.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/image.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/text.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/choice.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/rotate_image.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/color.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/bezier.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/combine_image.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/image_effects.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/polynomial.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/blend_image.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/resample_image.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/resample_text.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/image_effects.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/rotate_image.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/combine_image.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/polynomial.cpp
|
||||
magicseteditor_SOURCES += ./src/gfx/mask_image.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/cards_panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/card_viewer.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/filtered_card_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/select_card_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/package_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/gallery_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/graph.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/image_card_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/card_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/card_list_column_select.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/text_ctrl.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/native_look_editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/card_editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/text_ctrl.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/preferences_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/card_select_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/card_list_column_select.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/filtered_card_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/package_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/gallery_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/control/card_viewer.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/cards_panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/point_editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/control.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/part_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/basic_shape_editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/value/color.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/value/image.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/value/text.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/value/symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/value/multiple_choice.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/value/choice.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/value/text.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/value/image.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/value/editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/print_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/about_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/point_editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/basic_shape_editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/control.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/editor.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/part_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/symbol/window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/update_checker.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/new_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/icon_menu.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/value/choice.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/util.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/card_select_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/about_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/update_checker.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/icon_menu.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/new_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/preferences_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/welcome_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/print_window.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp
|
||||
magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp
|
||||
magicseteditor_SOURCES += ./src/script/script_manager.cpp
|
||||
magicseteditor_SOURCES += ./src/script/script.cpp
|
||||
magicseteditor_SOURCES += ./src/script/functions.cpp
|
||||
magicseteditor_SOURCES += ./src/script/value.cpp
|
||||
magicseteditor_SOURCES += ./src/script/dependency.cpp
|
||||
magicseteditor_SOURCES += ./src/script/image.cpp
|
||||
magicseteditor_SOURCES += ./src/script/context.cpp
|
||||
magicseteditor_SOURCES += ./src/script/scriptable.cpp
|
||||
magicseteditor_SOURCES += ./src/script/parser.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field/color.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field/boolean.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field/image.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field/text.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field/symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field/multiple_choice.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field/choice.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field/boolean.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field/text.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field/image.cpp
|
||||
magicseteditor_SOURCES += ./src/data/symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/data/stylesheet.cpp
|
||||
magicseteditor_SOURCES += ./src/data/set.cpp
|
||||
magicseteditor_SOURCES += ./src/data/font.cpp
|
||||
magicseteditor_SOURCES += ./src/data/locale.cpp
|
||||
magicseteditor_SOURCES += ./src/data/symbol_font.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/clipboard.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/image.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/html.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/mse1.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/mse2.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/mws.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/apprentice.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/formats.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/mtg_editor.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/image_to_symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/data/action/symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/data/action/set.cpp
|
||||
magicseteditor_SOURCES += ./src/data/action/symbol_part.cpp
|
||||
magicseteditor_SOURCES += ./src/data/action/value.cpp
|
||||
magicseteditor_SOURCES += ./src/data/card.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/html.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/apprentice.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/mtg_editor.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/formats.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/image.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/mws.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/mse1.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/mse2.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/clipboard.cpp
|
||||
magicseteditor_SOURCES += ./src/data/format/image_to_symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/data/statistics.cpp
|
||||
magicseteditor_SOURCES += ./src/data/locale.cpp
|
||||
magicseteditor_SOURCES += ./src/data/settings.cpp
|
||||
magicseteditor_SOURCES += ./src/data/keyword.cpp
|
||||
magicseteditor_SOURCES += ./src/data/symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/data/font.cpp
|
||||
magicseteditor_SOURCES += ./src/data/game.cpp
|
||||
magicseteditor_SOURCES += ./src/util/io/package.cpp
|
||||
magicseteditor_SOURCES += ./src/util/io/writer.cpp
|
||||
magicseteditor_SOURCES += ./src/data/card.cpp
|
||||
magicseteditor_SOURCES += ./src/data/field.cpp
|
||||
magicseteditor_SOURCES += ./src/data/keyword.cpp
|
||||
magicseteditor_SOURCES += ./src/data/stylesheet.cpp
|
||||
magicseteditor_SOURCES += ./src/data/statistics.cpp
|
||||
magicseteditor_SOURCES += ./src/data/set.cpp
|
||||
magicseteditor_SOURCES += ./src/data/symbol_font.cpp
|
||||
magicseteditor_SOURCES += ./src/util/io/get_member.cpp
|
||||
magicseteditor_SOURCES += ./src/util/io/reader.cpp
|
||||
magicseteditor_SOURCES += ./src/util/io/package_manager.cpp
|
||||
magicseteditor_SOURCES += ./src/util/io/package.cpp
|
||||
magicseteditor_SOURCES += ./src/util/io/writer.cpp
|
||||
magicseteditor_SOURCES += ./src/util/rotation.cpp
|
||||
magicseteditor_SOURCES += ./src/util/tagged_string.cpp
|
||||
magicseteditor_SOURCES += ./src/util/action_stack.cpp
|
||||
magicseteditor_SOURCES += ./src/util/string.cpp
|
||||
magicseteditor_SOURCES += ./src/util/alignment.cpp
|
||||
magicseteditor_SOURCES += ./src/util/version.cpp
|
||||
magicseteditor_SOURCES += ./src/util/string.cpp
|
||||
magicseteditor_SOURCES += ./src/util/tagged_string.cpp
|
||||
magicseteditor_SOURCES += ./src/util/age.cpp
|
||||
magicseteditor_SOURCES += ./src/util/error.cpp
|
||||
magicseteditor_SOURCES += ./src/util/age.cpp
|
||||
magicseteditor_SOURCES += ./src/main.cpp
|
||||
magicseteditor_SOURCES += ./src/code_template.cpp
|
||||
magicseteditor_SOURCES += ./src/render/card/viewer.cpp
|
||||
magicseteditor_SOURCES += ./src/render/text/symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/render/text/font.cpp
|
||||
magicseteditor_SOURCES += ./src/render/text/compound.cpp
|
||||
magicseteditor_SOURCES += ./src/render/text/viewer.cpp
|
||||
magicseteditor_SOURCES += ./src/render/text/element.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/color.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/symbol.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/choice.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/text.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/image.cpp
|
||||
magicseteditor_SOURCES += ./src/render/value/viewer.cpp
|
||||
magicseteditor_SOURCES += ./src/render/symbol/filter.cpp
|
||||
magicseteditor_SOURCES += ./src/render/symbol/viewer.cpp
|
||||
magicseteditor_SOURCES += ./src/script/parser.cpp
|
||||
magicseteditor_SOURCES += ./src/script/functions.cpp
|
||||
magicseteditor_SOURCES += ./src/script/image.cpp
|
||||
magicseteditor_SOURCES += ./src/script/dependency.cpp
|
||||
magicseteditor_SOURCES += ./src/script/value.cpp
|
||||
magicseteditor_SOURCES += ./src/script/script.cpp
|
||||
magicseteditor_SOURCES += ./src/script/context.cpp
|
||||
magicseteditor_SOURCES += ./src/script/script_manager.cpp
|
||||
magicseteditor_SOURCES += ./src/script/scriptable.cpp
|
||||
|
||||
-1206
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,441 @@
|
||||
#! /bin/sh
|
||||
|
||||
# depcomp - compile a program generating dependencies as side-effects
|
||||
# Copyright 1999, 2000 Free Software Foundation, Inc.
|
||||
|
||||
# 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, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
# 02111-1307, USA.
|
||||
|
||||
# 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.
|
||||
|
||||
# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
|
||||
|
||||
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
|
||||
echo "depcomp: Variables source, object and depmode must be set" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
# `libtool' can also be set to `yes' or `no'.
|
||||
|
||||
depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
|
||||
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
|
||||
|
||||
rm -f "$tmpdepfile"
|
||||
|
||||
# Some modes work just like other modes, but use different flags. We
|
||||
# parameterize here, but still list the modes in the big case below,
|
||||
# to make depend.m4 easier to write. Note that we *cannot* use a case
|
||||
# here, because this file can only contain one case statement.
|
||||
if test "$depmode" = hp; then
|
||||
# HP compiler uses -M and no extra arg.
|
||||
gccflag=-M
|
||||
depmode=gcc
|
||||
fi
|
||||
|
||||
if test "$depmode" = dashXmstdout; then
|
||||
# This is just like dashmstdout with a different argument.
|
||||
dashmflag=-xM
|
||||
depmode=dashmstdout
|
||||
fi
|
||||
|
||||
case "$depmode" in
|
||||
gcc3)
|
||||
## gcc 3 implements dependency tracking that does exactly what
|
||||
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
|
||||
## it if -MD -MP comes after the -MF stuff. Hmm.
|
||||
"$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
mv "$tmpdepfile" "$depfile"
|
||||
;;
|
||||
|
||||
gcc)
|
||||
## There are various ways to get dependency output from gcc. Here's
|
||||
## why we pick this rather obscure method:
|
||||
## - Don't want to use -MD because we'd like the dependencies to end
|
||||
## up in a subdir. Having to rename by hand is ugly.
|
||||
## (We might end up doing this anyway to support other compilers.)
|
||||
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
|
||||
## -MM, not -M (despite what the docs say).
|
||||
## - Using -M directly means running the compiler twice (even worse
|
||||
## than renaming).
|
||||
if test -z "$gccflag"; then
|
||||
gccflag=-MD,
|
||||
fi
|
||||
"$@" -Wp,"$gccflag$tmpdepfile"
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
rm -f "$depfile"
|
||||
echo "$object : \\" > "$depfile"
|
||||
alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
|
||||
## The second -e expression handles DOS-style file names with drive letters.
|
||||
sed -e 's/^[^:]*: / /' \
|
||||
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
|
||||
## This next piece of magic avoids the `deleted header file' problem.
|
||||
## The problem is that when a header file which appears in a .P file
|
||||
## is deleted, the dependency causes make to die (because there is
|
||||
## typically no way to rebuild the header). We avoid this by adding
|
||||
## dummy dependencies for each header file. Too bad gcc doesn't do
|
||||
## this for us directly.
|
||||
tr ' ' '
|
||||
' < "$tmpdepfile" |
|
||||
## Some versions of gcc put a space before the `:'. On the theory
|
||||
## that the space means something, we add a space to the output as
|
||||
## well.
|
||||
## Some versions of the HPUX 10.20 sed can't process this invocation
|
||||
## correctly. Breaking it into two sed invocations is a workaround.
|
||||
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
hp)
|
||||
# This case exists only to let depend.m4 do its work. It works by
|
||||
# looking at the text of this script. This case will never be run,
|
||||
# since it is checked for above.
|
||||
exit 1
|
||||
;;
|
||||
|
||||
sgi)
|
||||
if test "$libtool" = yes; then
|
||||
"$@" "-Wp,-MDupdate,$tmpdepfile"
|
||||
else
|
||||
"$@" -MDupdate "$tmpdepfile"
|
||||
fi
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
rm -f "$depfile"
|
||||
|
||||
if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
|
||||
echo "$object : \\" > "$depfile"
|
||||
|
||||
# Clip off the initial element (the dependent). Don't try to be
|
||||
# clever and replace this with sed code, as IRIX sed won't handle
|
||||
# lines with more than a fixed number of characters (4096 in
|
||||
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
|
||||
# the IRIX cc adds comments like `#:fec' to the end of the
|
||||
# dependency line.
|
||||
tr ' ' '
|
||||
' < "$tmpdepfile" \
|
||||
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
|
||||
tr '
|
||||
' ' ' >> $depfile
|
||||
echo >> $depfile
|
||||
|
||||
# The second pass generates a dummy entry for each header file.
|
||||
tr ' ' '
|
||||
' < "$tmpdepfile" \
|
||||
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
|
||||
>> $depfile
|
||||
else
|
||||
# The sourcefile does not contain any dependencies, so just
|
||||
# store a dummy comment line, to avoid errors with the Makefile
|
||||
# "include basename.Plo" scheme.
|
||||
echo "#dummy" > "$depfile"
|
||||
fi
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
aix)
|
||||
# The C for AIX Compiler uses -M and outputs the dependencies
|
||||
# in a .u file. This file always lives in the current directory.
|
||||
# Also, the AIX compiler puts `$object:' at the start of each line;
|
||||
# $object doesn't have directory information.
|
||||
stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
|
||||
tmpdepfile="$stripped.u"
|
||||
outname="$stripped.o"
|
||||
if test "$libtool" = yes; then
|
||||
"$@" -Wc,-M
|
||||
else
|
||||
"$@" -M
|
||||
fi
|
||||
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
|
||||
if test -f "$tmpdepfile"; then
|
||||
# Each line is of the form `foo.o: dependent.h'.
|
||||
# Do two passes, one to just change these to
|
||||
# `$object: dependent.h' and one to simply `dependent.h:'.
|
||||
sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
|
||||
sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
|
||||
else
|
||||
# The sourcefile does not contain any dependencies, so just
|
||||
# store a dummy comment line, to avoid errors with the Makefile
|
||||
# "include basename.Plo" scheme.
|
||||
echo "#dummy" > "$depfile"
|
||||
fi
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
icc)
|
||||
# Must come before tru64.
|
||||
|
||||
# Intel's C compiler understands `-MD -MF file'. However
|
||||
# icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
|
||||
# will fill foo.d with something like
|
||||
# foo.o: sub/foo.c
|
||||
# foo.o: sub/foo.h
|
||||
# which is wrong. We want:
|
||||
# sub/foo.o: sub/foo.c
|
||||
# sub/foo.o: sub/foo.h
|
||||
# sub/foo.c:
|
||||
# sub/foo.h:
|
||||
|
||||
"$@" -MD -MF "$tmpdepfile"
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
rm -f "$tmpdepfile"
|
||||
exit $stat
|
||||
fi
|
||||
rm -f "$depfile"
|
||||
# Each line is of the form `foo.o: dependent.h'.
|
||||
# Do two passes, one to just change these to
|
||||
# `$object: dependent.h' and one to simply `dependent.h:'.
|
||||
sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
|
||||
sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
tru64)
|
||||
# The Tru64 AIX compiler uses -MD to generate dependencies as a side
|
||||
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
|
||||
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
|
||||
# dependencies in `foo.d' instead, so we check for that too.
|
||||
# Subdirectories are respected.
|
||||
|
||||
tmpdepfile1="$object.d"
|
||||
tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
|
||||
if test "$libtool" = yes; then
|
||||
"$@" -Wc,-MD
|
||||
else
|
||||
"$@" -MD
|
||||
fi
|
||||
|
||||
stat=$?
|
||||
if test $stat -eq 0; then :
|
||||
else
|
||||
rm -f "$tmpdepfile1" "$tmpdepfile2"
|
||||
exit $stat
|
||||
fi
|
||||
|
||||
if test -f "$tmpdepfile1"; then
|
||||
tmpdepfile="$tmpdepfile1"
|
||||
else
|
||||
tmpdepfile="$tmpdepfile2"
|
||||
fi
|
||||
if test -f "$tmpdepfile"; then
|
||||
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
||||
# That's a space and a tab in the [].
|
||||
sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
||||
else
|
||||
echo "#dummy" > "$depfile"
|
||||
fi
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
#nosideeffect)
|
||||
# This comment above is used by automake to tell side-effect
|
||||
# dependency tracking mechanisms from slower ones.
|
||||
|
||||
dashmstdout)
|
||||
# Important note: in order to support this mode, a compiler *must*
|
||||
# always write the proprocessed file to stdout, regardless of -o,
|
||||
# because we must use -o when running libtool.
|
||||
test -z "$dashmflag" && dashmflag=-M
|
||||
( IFS=" "
|
||||
case " $* " in
|
||||
*" --mode=compile "*) # this is libtool, let us make it quiet
|
||||
for arg
|
||||
do # cycle over the arguments
|
||||
case "$arg" in
|
||||
"--mode=compile")
|
||||
# insert --quiet before "--mode=compile"
|
||||
set fnord "$@" --quiet
|
||||
shift # fnord
|
||||
;;
|
||||
esac
|
||||
set fnord "$@" "$arg"
|
||||
shift # fnord
|
||||
shift # "$arg"
|
||||
done
|
||||
;;
|
||||
esac
|
||||
"$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
|
||||
) &
|
||||
proc=$!
|
||||
"$@"
|
||||
stat=$?
|
||||
wait "$proc"
|
||||
if test "$stat" != 0; then exit $stat; fi
|
||||
rm -f "$depfile"
|
||||
cat < "$tmpdepfile" > "$depfile"
|
||||
tr ' ' '
|
||||
' < "$tmpdepfile" | \
|
||||
## Some versions of the HPUX 10.20 sed can't process this invocation
|
||||
## correctly. Breaking it into two sed invocations is a workaround.
|
||||
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
dashXmstdout)
|
||||
# This case only exists to satisfy depend.m4. It is never actually
|
||||
# run, as this mode is specially recognized in the preamble.
|
||||
exit 1
|
||||
;;
|
||||
|
||||
makedepend)
|
||||
# X makedepend
|
||||
(
|
||||
shift
|
||||
cleared=no
|
||||
for arg in "$@"; do
|
||||
case $cleared in no)
|
||||
set ""; shift
|
||||
cleared=yes
|
||||
esac
|
||||
case "$arg" in
|
||||
-D*|-I*)
|
||||
set fnord "$@" "$arg"; shift;;
|
||||
-*)
|
||||
;;
|
||||
*)
|
||||
set fnord "$@" "$arg"; shift;;
|
||||
esac
|
||||
done
|
||||
obj_suffix="`echo $object | sed 's/^.*\././'`"
|
||||
touch "$tmpdepfile"
|
||||
${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
|
||||
) &
|
||||
proc=$!
|
||||
"$@"
|
||||
stat=$?
|
||||
wait "$proc"
|
||||
if test "$stat" != 0; then exit $stat; fi
|
||||
rm -f "$depfile"
|
||||
cat < "$tmpdepfile" > "$depfile"
|
||||
tail +3 "$tmpdepfile" | tr ' ' '
|
||||
' | \
|
||||
## Some versions of the HPUX 10.20 sed can't process this invocation
|
||||
## correctly. Breaking it into two sed invocations is a workaround.
|
||||
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
||||
rm -f "$tmpdepfile" "$tmpdepfile".bak
|
||||
;;
|
||||
|
||||
cpp)
|
||||
# Important note: in order to support this mode, a compiler *must*
|
||||
# always write the proprocessed file to stdout, regardless of -o,
|
||||
# because we must use -o when running libtool.
|
||||
( IFS=" "
|
||||
case " $* " in
|
||||
*" --mode=compile "*)
|
||||
for arg
|
||||
do # cycle over the arguments
|
||||
case $arg in
|
||||
"--mode=compile")
|
||||
# insert --quiet before "--mode=compile"
|
||||
set fnord "$@" --quiet
|
||||
shift # fnord
|
||||
;;
|
||||
esac
|
||||
set fnord "$@" "$arg"
|
||||
shift # fnord
|
||||
shift # "$arg"
|
||||
done
|
||||
;;
|
||||
esac
|
||||
"$@" -E |
|
||||
sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
|
||||
sed '$ s: \\$::' > "$tmpdepfile"
|
||||
) &
|
||||
proc=$!
|
||||
"$@"
|
||||
stat=$?
|
||||
wait "$proc"
|
||||
if test "$stat" != 0; then exit $stat; fi
|
||||
rm -f "$depfile"
|
||||
echo "$object : \\" > "$depfile"
|
||||
cat < "$tmpdepfile" >> "$depfile"
|
||||
sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
msvisualcpp)
|
||||
# Important note: in order to support this mode, a compiler *must*
|
||||
# always write the proprocessed file to stdout, regardless of -o,
|
||||
# because we must use -o when running libtool.
|
||||
( IFS=" "
|
||||
case " $* " in
|
||||
*" --mode=compile "*)
|
||||
for arg
|
||||
do # cycle over the arguments
|
||||
case $arg in
|
||||
"--mode=compile")
|
||||
# insert --quiet before "--mode=compile"
|
||||
set fnord "$@" --quiet
|
||||
shift # fnord
|
||||
;;
|
||||
esac
|
||||
set fnord "$@" "$arg"
|
||||
shift # fnord
|
||||
shift # "$arg"
|
||||
done
|
||||
;;
|
||||
esac
|
||||
"$@" -E |
|
||||
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
|
||||
) &
|
||||
proc=$!
|
||||
"$@"
|
||||
stat=$?
|
||||
wait "$proc"
|
||||
if test "$stat" != 0; then exit $stat; fi
|
||||
rm -f "$depfile"
|
||||
echo "$object : \\" > "$depfile"
|
||||
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
|
||||
echo " " >> "$depfile"
|
||||
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
|
||||
rm -f "$tmpdepfile"
|
||||
;;
|
||||
|
||||
none)
|
||||
exec "$@"
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "Unknown depmode $depmode" 1>&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@@ -9,8 +9,8 @@
|
||||
#include <data/action/symbol.hpp>
|
||||
#include <data/action/symbol_part.hpp>
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION2(pair<SymbolPartP,SymbolPartCombine>);
|
||||
DECLARE_TYPEOF_COLLECTION2(pair<SymbolPartP,size_t >);
|
||||
DECLARE_TYPEOF_COLLECTION((pair<SymbolPartP,SymbolPartCombine>));
|
||||
DECLARE_TYPEOF_COLLECTION((pair<SymbolPartP,size_t >));
|
||||
DECLARE_TYPEOF_COLLECTION(SymbolPartP);
|
||||
DECLARE_TYPEOF_COLLECTION(ControlPointP);
|
||||
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <util/reflect.hpp>
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION(FieldP);
|
||||
DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,ValueP>);
|
||||
DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,ValueP>));
|
||||
|
||||
// ----------------------------------------------------------------------------- : Card
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <util/io/package.hpp>
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
|
||||
DECLARE_TYPEOF2(map<String,ScriptableImage>);
|
||||
DECLARE_TYPEOF((map<String,ScriptableImage>));
|
||||
|
||||
// ----------------------------------------------------------------------------- : ChoiceField
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ bool is_mse1_symbol(const Image& img) {
|
||||
int r = *d++;
|
||||
int g = *d++;
|
||||
int b = *d++;
|
||||
delta += abs(r - b) + abs(r - g) + abs(b - g);
|
||||
delta += fabs(r - b) + fabs(r - g) + fabs(b - g);
|
||||
}
|
||||
}
|
||||
if (delta > 5000) return false; // not black & white enough
|
||||
@@ -357,7 +357,7 @@ void straighten(SymbolPart& part) {
|
||||
Vector2D bb = next.delta_before.normalized();
|
||||
// if the area beneath the polygon formed by the handles is small
|
||||
// then it is a straight line
|
||||
double cpDot = abs(aa.cross(ab)) + abs(bb.cross(ab));
|
||||
double cpDot = fabs(aa.cross(ab)) + fabs(bb.cross(ab));
|
||||
if (cpDot < treshold) {
|
||||
cur.segment_after = next.segment_before = SEGMENT_LINE;
|
||||
cur.delta_after = next.delta_before = Vector2D();
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <util/tagged_string.hpp>
|
||||
|
||||
class KeywordTrie;
|
||||
DECLARE_TYPEOF2(map<Char, KeywordTrie*>);
|
||||
DECLARE_TYPEOF((map<Char, KeywordTrie*>));
|
||||
|
||||
// ----------------------------------------------------------------------------- : Reflection
|
||||
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
#include <wx/sstream.h>
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION(CardP);
|
||||
DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,ValueP>);
|
||||
DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,ValueP>));
|
||||
|
||||
// ----------------------------------------------------------------------------- : Set
|
||||
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
DECLARE_TYPEOF_COLLECTION(CardP);
|
||||
DECLARE_TYPEOF_COLLECTION(FieldP);
|
||||
DECLARE_POINTER_TYPE(ChoiceValue);
|
||||
DECLARE_TYPEOF2(map<int,FieldP>);
|
||||
DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,StyleP>);
|
||||
DECLARE_TYPEOF((map<int,FieldP>));
|
||||
DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,StyleP>));
|
||||
|
||||
// ----------------------------------------------------------------------------- : Events
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ DECLARE_TYPEOF_COLLECTION(GraphAxisP);
|
||||
DECLARE_TYPEOF_COLLECTION(GraphElementP);
|
||||
DECLARE_TYPEOF_COLLECTION(GraphGroup);
|
||||
DECLARE_TYPEOF_COLLECTION(int);
|
||||
DECLARE_TYPEOF2(map<String,UInt>);
|
||||
DECLARE_TYPEOF((map<String,UInt>));
|
||||
|
||||
// ----------------------------------------------------------------------------- : Events
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <data/stylesheet.hpp>
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION(ValueViewerP);
|
||||
DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,StyleP>);
|
||||
DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,StyleP>));
|
||||
|
||||
// ----------------------------------------------------------------------------- : NativeLookEditor
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
WelcomeWindow::WelcomeWindow()
|
||||
: Frame(nullptr, wxID_ANY, _TITLE_("magic set editor"), wxDefaultPosition, wxSize(480,340), wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL | wxCLIP_CHILDREN )
|
||||
, logo (load_resource_image(_("about")))
|
||||
, logo2(load_resource_image(_("two")))
|
||||
, logo2(load_resource_image(_("two_beta")))
|
||||
{
|
||||
SetIcon(load_resource_icon(_("app")));
|
||||
|
||||
@@ -120,7 +120,7 @@ END_EVENT_TABLE ()
|
||||
// ----------------------------------------------------------------------------- : Hover button with label
|
||||
|
||||
HoverButtonExt::HoverButtonExt(Window* parent, int id, const wxImage& icon, const String& label, const String& sub_label)
|
||||
: HoverButton(parent, id, _("BTN"))
|
||||
: HoverButton(parent, id, _("btn"))
|
||||
, icon(icon)
|
||||
, label(label), sub_label(sub_label)
|
||||
, font_large(14, wxSWISS, wxNORMAL, wxNORMAL, false, _("Arial"))
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <gui/util.hpp> // clearDC
|
||||
|
||||
DECLARE_TYPEOF_COLLECTION(ValueViewerP);
|
||||
DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,StyleP>);
|
||||
DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,StyleP>));
|
||||
|
||||
// ----------------------------------------------------------------------------- : DataViewer
|
||||
|
||||
|
||||
@@ -110,7 +110,7 @@ bool_no IMAGE "../common/bool_no.png"
|
||||
//help_page BITMAP "help_page.png"
|
||||
|
||||
about IMAGE "../common/about.png"
|
||||
two IMAGE "../common/two_beta.png"
|
||||
two_beta IMAGE "../common/two_beta.png"
|
||||
btn_normal IMAGE "../common/btn_normal.png"
|
||||
btn_hover IMAGE "../common/btn_hover.png"
|
||||
btn_focus IMAGE "../common/btn_focus.png"
|
||||
@@ -155,7 +155,7 @@ FILETYPE VFT_APP
|
||||
VALUE "License", "GNU General Public License 2 or later; This is free software, and you are welcome to redistribute it under certain conditions; See the help file for details"
|
||||
VALUE "FileDescription", "Magic Set Editor"
|
||||
VALUE "InternalName", "mse2/8"
|
||||
VALUE "LegalCopyright", "© 2001-2006 Twan van Laarhoven"
|
||||
VALUE "LegalCopyright", " 2001-2006 Twan van Laarhoven"
|
||||
VALUE "ProductName", "Magic Set Editor"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,8 +22,8 @@ DECLARE_TYPEOF(Contexts);
|
||||
DECLARE_TYPEOF_COLLECTION(CardP);
|
||||
DECLARE_TYPEOF_COLLECTION(FieldP);
|
||||
DECLARE_TYPEOF_COLLECTION(Dependency);
|
||||
DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,StyleP>);
|
||||
DECLARE_TYPEOF_NO_REV2(IndexMap<FieldP,ValueP>);
|
||||
DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,StyleP>));
|
||||
DECLARE_TYPEOF_NO_REV((IndexMap<FieldP,ValueP>));
|
||||
|
||||
// initialize functions, from functions.cpp
|
||||
void init_script_functions(Context& ctx);
|
||||
|
||||
+1
-17
@@ -24,8 +24,6 @@
|
||||
#define DECLARE_TYPEOF_NO_REV(T)
|
||||
#define DECLARE_TYPEOF_CONST(T)
|
||||
#define DECLARE_TYPEOF_COLLECTION(T)
|
||||
#define DECLARE_TYPEOF2(A,B)
|
||||
#define DECLARE_TYPEOF_NO_REV2(A,B)
|
||||
|
||||
#define TYPEOF(Value) __typeof(Value)
|
||||
#define TYPEOF_IT(Value) __typeof(Value.begin())
|
||||
@@ -88,21 +86,7 @@
|
||||
|
||||
/// Declare typeof magic for a specific std::vector type
|
||||
#define DECLARE_TYPEOF_COLLECTION(T) DECLARE_TYPEOF(vector<T>); \
|
||||
DECLARE_TYPEOF_CONST(set<T>)
|
||||
|
||||
/// Declare typeof magic for a specific type, with two template arguments
|
||||
/** This is needed because the preprocessor sees MACRO(class<a,b>)
|
||||
* as a macro call with two arguments.
|
||||
*/
|
||||
#define DECLARE_TYPEOF2(A,B) \
|
||||
typedef A,B BOOST_PP_CAT(TypeOfTemp,__LINE__); \
|
||||
DECLARE_TYPEOF(BOOST_PP_CAT(TypeOfTemp,__LINE__))
|
||||
#define DECLARE_TYPEOF_NO_REV2(A,B) \
|
||||
typedef A,B BOOST_PP_CAT(TypeOfTemp,__LINE__); \
|
||||
DECLARE_TYPEOF_NO_REV(BOOST_PP_CAT(TypeOfTemp,__LINE__))
|
||||
#define DECLARE_TYPEOF_COLLECTION2(A,B) \
|
||||
typedef A,B BOOST_PP_CAT(TypeOfTemp,__LINE__); \
|
||||
DECLARE_TYPEOF_COLLECTION(BOOST_PP_CAT(TypeOfTemp,__LINE__))
|
||||
// DECLARE_TYPEOF_CONST(set<T>)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user