From 58e4b6d9320ae9c2d00a85e9a9cfa6f4eafbe30d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 17 May 2008 20:41:33 +0000 Subject: [FIX] Pokemodr overlays are now in overlays, not images/overlays [FIX] Better installing procedures [FIX] Desktop file now valid [FIX] Building now does not touch out of main directory [FIX] Documentation moved around to proper places git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@145 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- Changelog | 18 ++++++ general/general.pro | 6 +- make-tarball.sh | 7 +-- pokegen.pro | 21 ++++--- pokegen.spec | 8 ++- pokegen.tex | 105 ----------------------------------- pokegen/pokegen.pro | 45 ++++++++++----- pokegen/pokegen.tex | 105 +++++++++++++++++++++++++++++++++++ pokemod/pokemod.pro | 8 +-- pokemodr/images/overlays.qrc | 11 ---- pokemodr/images/overlays/effect.png | Bin 340 -> 0 bytes pokemodr/images/overlays/no-walk.png | Bin 149 -> 0 bytes pokemodr/images/overlays/trainer.png | Bin 284 -> 0 bytes pokemodr/images/overlays/walk.png | Bin 192 -> 0 bytes pokemodr/images/overlays/warp.png | Bin 296 -> 0 bytes pokemodr/images/overlays/water.png | Bin 192 -> 0 bytes pokemodr/images/overlays/wilds.png | Bin 418 -> 0 bytes pokemodr/overlays/effect.png | Bin 0 -> 340 bytes pokemodr/overlays/no-walk.png | Bin 0 -> 149 bytes pokemodr/overlays/overlays.qrc | 11 ++++ pokemodr/overlays/trainer.png | Bin 0 -> 284 bytes pokemodr/overlays/walk.png | Bin 0 -> 192 bytes pokemodr/overlays/warp.png | Bin 0 -> 296 bytes pokemodr/overlays/water.png | Bin 0 -> 192 bytes pokemodr/overlays/wilds.png | Bin 0 -> 418 bytes pokemodr/pokemodr.desktop | 9 +-- pokemodr/pokemodr.pro | 30 ++++++++-- 27 files changed, 218 insertions(+), 166 deletions(-) delete mode 100644 pokegen.tex create mode 100644 pokegen/pokegen.tex delete mode 100644 pokemodr/images/overlays.qrc delete mode 100644 pokemodr/images/overlays/effect.png delete mode 100644 pokemodr/images/overlays/no-walk.png delete mode 100644 pokemodr/images/overlays/trainer.png delete mode 100644 pokemodr/images/overlays/walk.png delete mode 100644 pokemodr/images/overlays/warp.png delete mode 100644 pokemodr/images/overlays/water.png delete mode 100644 pokemodr/images/overlays/wilds.png create mode 100644 pokemodr/overlays/effect.png create mode 100644 pokemodr/overlays/no-walk.png create mode 100644 pokemodr/overlays/overlays.qrc create mode 100644 pokemodr/overlays/trainer.png create mode 100644 pokemodr/overlays/walk.png create mode 100644 pokemodr/overlays/warp.png create mode 100644 pokemodr/overlays/water.png create mode 100644 pokemodr/overlays/wilds.png diff --git a/Changelog b/Changelog index 56b453ae..29dca5f0 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,21 @@ +----------------- +Rev: 145 +Date: 17 May 2008 +User: MathStuf +----------------- +[FIX] Pokemodr overlays are now in overlays, not images/overlays +[FIX] Better installing procedures +[FIX] Desktop file now valid +[FIX] Building now does not touch out of main directory +[FIX] Documentation moved around to proper places + +----------------- +Rev: 144 +Date: 17 May 2008 +User: MathStuf +----------------- +[FIX] Fixed up the distsrc target + ----------------- Rev: 143 Date: 17 May 2008 diff --git a/general/general.pro b/general/general.pro index 02d6a5b9..73405b21 100644 --- a/general/general.pro +++ b/general/general.pro @@ -1,6 +1,6 @@ TEMPLATE = lib OBJECTS_DIR = .obj -DESTDIR = ../../bin +DESTDIR = ../bin CONFIG += qt \ warn_on \ @@ -18,7 +18,6 @@ HEADERS += Flag.h \ Matrix.h \ Point.h -INSTALLS += target isEmpty(PREFIX) { PREFIX = $$(PREFIX)/lib } @@ -26,5 +25,4 @@ isEmpty(PREFIX) { PREFIX = /usr/lib`kde4-config --libsuffix` } target.path = $$PREFIX - -DISTFILES += TODO +INSTALLS += target diff --git a/make-tarball.sh b/make-tarball.sh index efa75372..1d8a5e35 100755 --- a/make-tarball.sh +++ b/make-tarball.sh @@ -7,14 +7,11 @@ fi cd .. mkdir pokegen-$1 -cd pokegen-$1 -mkdir bin doc src -cd .. for x in `svn ls -R -r HEAD src`; do if [ -d src/$x ]; then - mkdir pokegen-$1/src/$x; + mkdir pokegen-$1/$x; else - cp src/$x pokegen-$1/src/$x; + cp src/$x pokegen-$1/$x; fi done tar -c pokegen-$1 | bzip2 --best -c > releases/pokegen-$1.tar.bz2 diff --git a/pokegen.pro b/pokegen.pro index d6c9f5dc..2937a742 100755 --- a/pokegen.pro +++ b/pokegen.pro @@ -15,13 +15,18 @@ SUBDIRS = general \ distsrc.target = distsrc distsrc.commands = ./make-tarball.sh $${VERSION} -doc.target = doc -doc.commands = pdflatex pokegen.tex && \ - pdflatex pokegen.tex && \ - rm pokegen.aux pokegen.log pokegen.out pokegen.toc && \ - mv pokegen.pdf ../doc/pokegen.pdf +QMAKE_EXTRA_UNIX_TARGETS += distsrc -QMAKE_EXTRA_UNIX_TARGETS += distsrc doc +isEmpty(PREFIX) { + PREFIX = $$(PREFIX) +} +isEmpty(PREFIX) { + PREFIX = /usr +} +documentation.path = $$PREFIX/share/doc/pokegen-$${VERSION} +documentation.files = DISCLAIMER \ + LICENSE +INSTALLS += documentation win32 { ; nsis-installer.target = nsis-installer @@ -31,10 +36,10 @@ win32 { } mac { } else { rpm.target = rpm - rpm.commands = rpmbuild -bt ../releases/pokegen-$${VERSION}.tar.bz2 && \ + rpm.commands = rpmbuild -ta ../releases/pokegen-$${VERSION}.tar.bz2 && \ cp /usr/src/redhat/RPMS/$${ARCH}/pokegen-$${VERSION}.$${ARCH}.rpm ../pkg/ && \ cp /usr/src/redhat/SRPMS/$${ARCH}/pokegen-$${VERSION}.src.rpm ../pkg/ - rpm.depends = distsrc doc + rpm.depends = distsrc ; deb.target = deb ; deb.commands = dpkg -b ; deb.depends = distsrc doc diff --git a/pokegen.spec b/pokegen.spec index 6692dafb..f629b52d 100644 --- a/pokegen.spec +++ b/pokegen.spec @@ -22,14 +22,16 @@ It includes a network play and other tools to help create custom games. %build cd src -qmake-qt4 +qmake-qt4 PREFIX="%{_prefix}" CXXFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} +make doc %install rm -rf %{buildroot} mkdir %{buildroot} -make DESTDIR=%{buildroot} install +cd src +make INSTALL_ROOT=%{buildroot} install desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications \ %{SOURCE1} @@ -43,7 +45,7 @@ rm -rf ${buildroot} %defattr(-,root,root,-) %doc /usr/share/doc/pokegen-%{version}/DISCLAIMER %doc /usr/share/doc/pokegen-%{version}/LICENSE -%doc /usr/share/doc/pokegen-%{version}/pokegen.pdf +%doc /usr/share/doc/pokegen-%{version}/pokemodr.pdf /usr/bin/pokemodr %{_libdir}/libgeneral.so %{_libdir}/libpokemod.so diff --git a/pokegen.tex b/pokegen.tex deleted file mode 100644 index b09958e6..00000000 --- a/pokegen.tex +++ /dev/null @@ -1,105 +0,0 @@ -\documentclass[10pt]{article} - -\title{Pok\'eGen v0.0.1} -\author{Ben Boeckel} - -\usepackage{hyperref} -\hypersetup{colorlinks=true} -\usepackage[hmargin=1in,vmargin=1in]{geometry} -\usepackage{listings} - -\begin{document} -\lstset{basicstyle=\small,stringstyle=\ttfamily} - -\maketitle -\tableofcontents -\newpage - -\section{Building and installation} -\lstset{language=Bash} -\subsection{Linux} -\subsubsection{Build} -The following dependencies are required: -\begin{itemize} - \item Qt4 development packages - \item KDE4 library development packages - \item \LaTeX$ $ environment with \texttt{hyperref}, \texttt{geometry}, and \texttt{listings} -\end{itemize} -The packages should be available through your distribution's package management. To build Pok\'eGen: -\begin{lstlisting} -$ qmake # or qmake-qt4 if qmake refers to the Qt3 qmake -$ make -\end{lstlisting} -\subsubsection{Install} -To install Pok\'eGen to the default directories (\texttt{/usr/bin} and \texttt{/usr/lib}): -\begin{lstlisting} -$ make install -\end{lstlisting} -To build an RPM package: -\begin{lstlisting} -$ make rpm -\end{lstlisting} -Debian packages are not yet supported, but are planned. -\subsection{Windows} -\subsubsection{Build} -The KDE4 Windows installer is an easy way to install the Qt and KDE dependencies. It can be found at \href{http://download.cegit.de/kde-windows/installer/kdewin-installer-gui-latest.exe}{this direct link}. When installing, make sure that development install mode is chosen. Choose MinGW as the compiler. MSVC is as of yet untested. The following required packages are required (they will pull in other packages): -\begin{itemize} - \item \texttt{kdelibs-mingw} - \item \texttt{gcc-mingw} -\end{itemize} -After that, the PATH environment variable may need to be updated to include the following (replace \texttt{C:$\backslash$kde4} and \texttt{C:$\backslash$MinGW} with the directories you installed them to): -\begin{itemize} - \item \texttt{C:$\backslash$kde4$\backslash$bin} - \item \texttt{C:$\backslash$MinGW$\backslash$bin} -\end{itemize} -To build Pok\'Gen from there: -\begin{lstlisting} -> qmake -> mingw32-make -\end{lstlisting} -\subsubsection{Install} -To install Pok\'eGen to the default directory (\texttt{C:$\backslash$Program Files$\backslash$PokeGen}): -\begin{lstlisting} -> mingw32-make install -\end{lstlisting} -To build the installer, you will need NSIS. It can be found on \href{http://nsis.sourceforge.net}{their website}. You will also need \texttt{pdflatex} to make this documentation. MiKTeX can be found on \href{http://miktex.org}{their website}. After adding NSIS and \texttt{pdflatex} to the PATH, the following will create the NSIS installer: -\begin{lstlisting} -> mingw32-make nsis-installer -\end{lstlisting} -\subsection{Windows on Linux} -\subsubsection{Build} -Pok\'eGen can be built for Windows on Linux using MinGW-cross. The following packages are required: -\begin{itemize} - \item WINE (for the KDE4) - \item Qt4 development packages - \item \LaTeX environment with \texttt{hyperref}, \texttt{geometry}, and \texttt{listings} - \item MinGW-cross (available \href{http://mingw-cross.sourceforge.net}{here}) - \item NSIS (only if you want to build the installer; packages can be found on \href{http://repo.calcforge.org}{CalcForge.org}) -\end{itemize} -You will also need the mkspec for Qt4 to create the \texttt{Makefile}. They can be found in \texttt{src/win32-cross-g++}. The KDE4 Windows installer is an easy way to install the Qt and KDE dependencies. It can be found at \href{http://download.cegit.de/kde-windows/installer/kdewin-installer-gui-latest.exe}{this direct link}. When installing, make sure that development install mode is chosen. Choose MinGW as the compiler. The following required packages are required (they will pull in other packages): -\begin{itemize} - \item \texttt{kdelibs-mingw} -\end{itemize} -After that, the PATH environment variable may need to be updated to include the following (replace \texttt{c:$\backslash$kde4} and \texttt{c:$\backslash$MinGW} with the directories you installed them to): -\begin{itemize} - \item \texttt{c:$\backslash$kde4$\backslash$bin} - \item \texttt{c:$\backslash$MinGW$\backslash$bin} - \item \texttt{.} -\end{itemize} -To build Pok\'eGen: -\begin{lstlisting} -$ source cross-mingw-pokegen.sh # this file assumes ~/.wine/c/kde4 for KDE4 Windows -$ qmake -win32 # or qmake-qt4 if qmake refers to the Qt3 qmake -$ make -\end{lstlisting} -\subsubsection{Install} -Installing is not supported this way, but the NSIS installer can be built with: -\begin{lstlisting} -$ make nsis-installer -\end{lstlisting} -\subsection{Mac} -Mac building is not yet supported, but is planned. -\newpage -\section{Pok\'eModr} - -\end{document} diff --git a/pokegen/pokegen.pro b/pokegen/pokegen.pro index 0ca2609c..5c90a310 100644 --- a/pokegen/pokegen.pro +++ b/pokegen/pokegen.pro @@ -1,19 +1,34 @@ OBJECTS_DIR = .obj -DESTDIR = ../../bin +DESTDIR = ../bin TEMPLATE = app -LIBS += -L../../lib -lgeneral -lpokemod -loverworld -lbattle -laudio -lmenus +LIBS += -L../bin -lgeneral -lpokemod -loverworld -lbattle -laudio -lmenus CONFIG += qt \ -gui \ -warn_on \ -exceptions -INCLUDEPATH += ../pokemod \ -../overworld \ -../menus \ -../general \ -../battle -TARGETDEPS += ../../lib/libpokemod.so \ -../../lib/liboverworld.so \ -../../lib/libmenus.so \ -../../lib/libgeneral.so \ -../../lib/libbattle.so + gui \ + warn_on \ + exceptions +TARGETDEPS += ../lib/libpokemod.so \ + ../lib/liboverworld.so \ + ../lib/libmenus.so \ + ../lib/libgeneral.so \ + ../lib/libbattle.so + +doc.target = doc +doc.commands = pdflatex pokegen.tex && \ + pdflatex pokegen.tex && \ + rm pokegen.aux pokegen.log pokegen.out pokegen.toc && \ + mv pokegen.pdf ../doc/pokegen.pdf + +QMAKE_EXTRA_UNIX_TARGETS += doc + +isEmpty(PREFIX) { + PREFIX = $$(PREFIX) +} +isEmpty(PREFIX) { + PREFIX = /usr +} +target.path = $$PREFIX/bin +documentation.path = $$PREFIX/share/doc/pokegen/pokegen-$${VERSION} +documentation.files = ../doc/pokegen.pdf +documentation.extra = make doc +INSTALLS += target documentation diff --git a/pokegen/pokegen.tex b/pokegen/pokegen.tex new file mode 100644 index 00000000..b09958e6 --- /dev/null +++ b/pokegen/pokegen.tex @@ -0,0 +1,105 @@ +\documentclass[10pt]{article} + +\title{Pok\'eGen v0.0.1} +\author{Ben Boeckel} + +\usepackage{hyperref} +\hypersetup{colorlinks=true} +\usepackage[hmargin=1in,vmargin=1in]{geometry} +\usepackage{listings} + +\begin{document} +\lstset{basicstyle=\small,stringstyle=\ttfamily} + +\maketitle +\tableofcontents +\newpage + +\section{Building and installation} +\lstset{language=Bash} +\subsection{Linux} +\subsubsection{Build} +The following dependencies are required: +\begin{itemize} + \item Qt4 development packages + \item KDE4 library development packages + \item \LaTeX$ $ environment with \texttt{hyperref}, \texttt{geometry}, and \texttt{listings} +\end{itemize} +The packages should be available through your distribution's package management. To build Pok\'eGen: +\begin{lstlisting} +$ qmake # or qmake-qt4 if qmake refers to the Qt3 qmake +$ make +\end{lstlisting} +\subsubsection{Install} +To install Pok\'eGen to the default directories (\texttt{/usr/bin} and \texttt{/usr/lib}): +\begin{lstlisting} +$ make install +\end{lstlisting} +To build an RPM package: +\begin{lstlisting} +$ make rpm +\end{lstlisting} +Debian packages are not yet supported, but are planned. +\subsection{Windows} +\subsubsection{Build} +The KDE4 Windows installer is an easy way to install the Qt and KDE dependencies. It can be found at \href{http://download.cegit.de/kde-windows/installer/kdewin-installer-gui-latest.exe}{this direct link}. When installing, make sure that development install mode is chosen. Choose MinGW as the compiler. MSVC is as of yet untested. The following required packages are required (they will pull in other packages): +\begin{itemize} + \item \texttt{kdelibs-mingw} + \item \texttt{gcc-mingw} +\end{itemize} +After that, the PATH environment variable may need to be updated to include the following (replace \texttt{C:$\backslash$kde4} and \texttt{C:$\backslash$MinGW} with the directories you installed them to): +\begin{itemize} + \item \texttt{C:$\backslash$kde4$\backslash$bin} + \item \texttt{C:$\backslash$MinGW$\backslash$bin} +\end{itemize} +To build Pok\'Gen from there: +\begin{lstlisting} +> qmake +> mingw32-make +\end{lstlisting} +\subsubsection{Install} +To install Pok\'eGen to the default directory (\texttt{C:$\backslash$Program Files$\backslash$PokeGen}): +\begin{lstlisting} +> mingw32-make install +\end{lstlisting} +To build the installer, you will need NSIS. It can be found on \href{http://nsis.sourceforge.net}{their website}. You will also need \texttt{pdflatex} to make this documentation. MiKTeX can be found on \href{http://miktex.org}{their website}. After adding NSIS and \texttt{pdflatex} to the PATH, the following will create the NSIS installer: +\begin{lstlisting} +> mingw32-make nsis-installer +\end{lstlisting} +\subsection{Windows on Linux} +\subsubsection{Build} +Pok\'eGen can be built for Windows on Linux using MinGW-cross. The following packages are required: +\begin{itemize} + \item WINE (for the KDE4) + \item Qt4 development packages + \item \LaTeX environment with \texttt{hyperref}, \texttt{geometry}, and \texttt{listings} + \item MinGW-cross (available \href{http://mingw-cross.sourceforge.net}{here}) + \item NSIS (only if you want to build the installer; packages can be found on \href{http://repo.calcforge.org}{CalcForge.org}) +\end{itemize} +You will also need the mkspec for Qt4 to create the \texttt{Makefile}. They can be found in \texttt{src/win32-cross-g++}. The KDE4 Windows installer is an easy way to install the Qt and KDE dependencies. It can be found at \href{http://download.cegit.de/kde-windows/installer/kdewin-installer-gui-latest.exe}{this direct link}. When installing, make sure that development install mode is chosen. Choose MinGW as the compiler. The following required packages are required (they will pull in other packages): +\begin{itemize} + \item \texttt{kdelibs-mingw} +\end{itemize} +After that, the PATH environment variable may need to be updated to include the following (replace \texttt{c:$\backslash$kde4} and \texttt{c:$\backslash$MinGW} with the directories you installed them to): +\begin{itemize} + \item \texttt{c:$\backslash$kde4$\backslash$bin} + \item \texttt{c:$\backslash$MinGW$\backslash$bin} + \item \texttt{.} +\end{itemize} +To build Pok\'eGen: +\begin{lstlisting} +$ source cross-mingw-pokegen.sh # this file assumes ~/.wine/c/kde4 for KDE4 Windows +$ qmake -win32 # or qmake-qt4 if qmake refers to the Qt3 qmake +$ make +\end{lstlisting} +\subsubsection{Install} +Installing is not supported this way, but the NSIS installer can be built with: +\begin{lstlisting} +$ make nsis-installer +\end{lstlisting} +\subsection{Mac} +Mac building is not yet supported, but is planned. +\newpage +\section{Pok\'eModr} + +\end{document} diff --git a/pokemod/pokemod.pro b/pokemod/pokemod.pro index 3bd2ed30..01ee42e8 100644 --- a/pokemod/pokemod.pro +++ b/pokemod/pokemod.pro @@ -1,8 +1,8 @@ TEMPLATE = lib OBJECTS_DIR = .obj MOC_DIR = .moc -DESTDIR = ../../bin -LIBS += -L../../bin \ +DESTDIR = ../bin +LIBS += -L../bin \ -lgeneral CONFIG += qt \ @@ -91,7 +91,6 @@ HEADERS += AbilityEffect.h \ Trainer.h \ Type.h -INSTALLS += target isEmpty(PREFIX) { PREFIX = $$(PREFIX)/lib } @@ -99,5 +98,4 @@ isEmpty(PREFIX) { PREFIX = /usr/lib`kde4-config --libsuffix` } target.path = $$PREFIX - -DISTFILES += TODO +INSTALLS += target diff --git a/pokemodr/images/overlays.qrc b/pokemodr/images/overlays.qrc deleted file mode 100644 index 98be3f31..00000000 --- a/pokemodr/images/overlays.qrc +++ /dev/null @@ -1,11 +0,0 @@ - - - overlays/effect.png - overlays/no-walk.png - overlays/trainer.png - overlays/walk.png - overlays/warp.png - overlays/water.png - overlays/wilds.png - - diff --git a/pokemodr/images/overlays/effect.png b/pokemodr/images/overlays/effect.png deleted file mode 100644 index 6d4c38a1..00000000 Binary files a/pokemodr/images/overlays/effect.png and /dev/null differ diff --git a/pokemodr/images/overlays/no-walk.png b/pokemodr/images/overlays/no-walk.png deleted file mode 100644 index 11b15e81..00000000 Binary files a/pokemodr/images/overlays/no-walk.png and /dev/null differ diff --git a/pokemodr/images/overlays/trainer.png b/pokemodr/images/overlays/trainer.png deleted file mode 100644 index e0d23cae..00000000 Binary files a/pokemodr/images/overlays/trainer.png and /dev/null differ diff --git a/pokemodr/images/overlays/walk.png b/pokemodr/images/overlays/walk.png deleted file mode 100644 index f4e69557..00000000 Binary files a/pokemodr/images/overlays/walk.png and /dev/null differ diff --git a/pokemodr/images/overlays/warp.png b/pokemodr/images/overlays/warp.png deleted file mode 100644 index 20baeb10..00000000 Binary files a/pokemodr/images/overlays/warp.png and /dev/null differ diff --git a/pokemodr/images/overlays/water.png b/pokemodr/images/overlays/water.png deleted file mode 100644 index b625a0b0..00000000 Binary files a/pokemodr/images/overlays/water.png and /dev/null differ diff --git a/pokemodr/images/overlays/wilds.png b/pokemodr/images/overlays/wilds.png deleted file mode 100644 index 45dcda5f..00000000 Binary files a/pokemodr/images/overlays/wilds.png and /dev/null differ diff --git a/pokemodr/overlays/effect.png b/pokemodr/overlays/effect.png new file mode 100644 index 00000000..6d4c38a1 Binary files /dev/null and b/pokemodr/overlays/effect.png differ diff --git a/pokemodr/overlays/no-walk.png b/pokemodr/overlays/no-walk.png new file mode 100644 index 00000000..11b15e81 Binary files /dev/null and b/pokemodr/overlays/no-walk.png differ diff --git a/pokemodr/overlays/overlays.qrc b/pokemodr/overlays/overlays.qrc new file mode 100644 index 00000000..dbee4543 --- /dev/null +++ b/pokemodr/overlays/overlays.qrc @@ -0,0 +1,11 @@ + + + effect.png + no-walk.png + trainer.png + walk.png + warp.png + water.png + wilds.png + + diff --git a/pokemodr/overlays/trainer.png b/pokemodr/overlays/trainer.png new file mode 100644 index 00000000..e0d23cae Binary files /dev/null and b/pokemodr/overlays/trainer.png differ diff --git a/pokemodr/overlays/walk.png b/pokemodr/overlays/walk.png new file mode 100644 index 00000000..f4e69557 Binary files /dev/null and b/pokemodr/overlays/walk.png differ diff --git a/pokemodr/overlays/warp.png b/pokemodr/overlays/warp.png new file mode 100644 index 00000000..20baeb10 Binary files /dev/null and b/pokemodr/overlays/warp.png differ diff --git a/pokemodr/overlays/water.png b/pokemodr/overlays/water.png new file mode 100644 index 00000000..b625a0b0 Binary files /dev/null and b/pokemodr/overlays/water.png differ diff --git a/pokemodr/overlays/wilds.png b/pokemodr/overlays/wilds.png new file mode 100644 index 00000000..45dcda5f Binary files /dev/null and b/pokemodr/overlays/wilds.png differ diff --git a/pokemodr/pokemodr.desktop b/pokemodr/pokemodr.desktop index 97854ee2..a87c55f4 100644 --- a/pokemodr/pokemodr.desktop +++ b/pokemodr/pokemodr.desktop @@ -1,9 +1,10 @@ [Desktop Entry] -Version=0.0.1 +Encoding=UTF-8 Type=Application Name=PokéModr Comment=Program to edit PokéMods -TryExec=pokemodr -Exec=pokemodr %U +GenericName=Program to edit PokéMods +Exec=/usr/bin/pokemodr %U Icon=pokemodr -MimeType=text/x-pokemod+xml +Categories=Qt;KDE;Game; +MimeType=application/x-pokemod+xml; diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro index 1b9be0fc..2c649d20 100644 --- a/pokemodr/pokemodr.pro +++ b/pokemodr/pokemodr.pro @@ -2,8 +2,8 @@ TEMPLATE = app OBJECTS_DIR = .obj UI_DIR = .ui MOC_DIR = .moc -DESTDIR = ../../bin -LIBS += -L../../bin \ +DESTDIR = ../bin +LIBS += -L../bin \ -lgeneral \ -lpokemod \ -lphonon \ @@ -19,7 +19,7 @@ QT += xml CONFIG += debug } -RESOURCES += images/overlays.qrc +RESOURCES += overlays/overlays.qrc win32 { TARGETDEPS += $${DESTDIR}/pokemod.dll $${DESTDIR}/general.dll @@ -265,7 +265,14 @@ FORMS += gui/ability.ui \ gui/trainer.ui \ gui/type.ui -INSTALLS += target +doc.target = doc +doc.commands = pdflatex pokemodr.tex && \ + pdflatex pokemodr.tex && \ + rm pokemodr.aux pokemodr.log pokemodr.out pokemodr.toc && \ + mv pokemodr.pdf ../doc/pokemodr.pdf + +QMAKE_EXTRA_UNIX_TARGETS += doc + isEmpty(PREFIX) { PREFIX = $$(PREFIX) } @@ -273,5 +280,16 @@ isEmpty(PREFIX) { PREFIX = /usr } target.path = $$PREFIX/bin - -DISTFILES += TODO +resources.path = $$PREFIX/share/pokegen/overlays +resources.files = overlays/overlays.qrc \ + overlays/effect.png \ + overlays/no-walk.png \ + overlays/trainer.png \ + overlays/walk.png \ + overlays/warp.png \ + overlays/water.png \ + overlays/wilds.png +documentation.path = $$PREFIX/share/doc/pokegen-$${VERSION} +documentation.files = ../doc/pokemodr.pdf +documentation.extra = make doc +INSTALLS += target resources documentation -- cgit