Minor various fixes, Dialog validation started, GUI fixes, String methods added

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@21 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 151 insertions, 0 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..0bb183fd
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,151 @@
+objDir = ../obj
+binDir = ../bin
+
+pokemodDir = pokemod
+pokemodrDir = pokemodr
+
+options = -Wall -O3
+
+pokemodr : pokemod
+	g++ $(options) -o $(binDir)/pokemodr $(pokemodr)/PokeModr.cpp -lpokemod
+
+pokemod : Pokemod.o
+	ld -G $(objDir)/$(pokemodDir)/*.o -o $(binDir)/libpokemod.so
+
+Ability.o : $(pokemodDir)/Ability.h $(pokemodDir)/Ability.cpp Object.o AbilityEffect.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Ability.o $(pokemodDir)/Ability.cpp
+
+AbilityEffect.o : $(pokemodDir)/AbilityEffect.h $(pokemodDir)/AbilityEffect.cpp Object.o Pokemod.o Type.o String.o Frac.o Ref.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/AbilityEffect.o $(pokemodDir)/AbilityEffect.cpp
+
+Author.o : $(pokemodDir)/Author.h $(pokemodDir)/Author.cpp String.o Object.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Author.o $(pokemodDir)/Author.cpp
+
+Badge.o : $(pokemodDir)/Badge.h $(pokemodDir)/Badge.cpp Object.o Pokemod.o String.o Frac.o Ref.o Path.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Badge.o $(pokemodDir)/Badge.cpp
+
+CoinItem.o : $(pokemodDir)/CoinItem.h $(pokemodDir)/CoinItem.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/CoinItem.o $(pokemodDir)/CoinItem.cpp
+
+CoinList.o : $(pokemodDir)/CoinList.h $(pokemodDir)/CoinList.cpp Object.o Pokemod.o CoinItem.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/CoinList.o $(pokemodDir)/CoinList.cpp
+
+Debug.o : $(pokemodDir)/Debug.h $(pokemodDir)/Debug.cpp String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Debug.o $(pokemodDir)/Debug.cpp
+
+Dialog.o : $(pokemodDir)/Dialog.h $(pokemodDir)/Dialog.cpp Object.o Pokemod.o Path.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Dialog.o $(pokemodDir)/Dialog.cpp
+
+EggGroup.o : $(pokemodDir)/EggGroup.h $(pokemodDir)/EggGroup.cpp Object.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/EggGroup.o $(pokemodDir)/EggGroup.cpp
+
+Flag.o : $(pokemodDir)/Flag.h $(pokemodDir)/Flag.cpp Debug.o Ini.o Ref.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Flag.o $(pokemodDir)/Flag.cpp
+
+Frac.o : $(pokemodDir)/Frac.h $(pokemodDir)/Frac.cpp Debug.o Ini.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Frac.o $(pokemodDir)/Frac.cpp
+
+Ini.o : $(pokemodDir)/Ini.h $(pokemodDir)/Ini.cpp String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Ini.o $(pokemodDir)/Ini.cpp
+
+Item.o : $(pokemodDir)/Item.h $(pokemodDir)/Item.cpp Object.o Pokemod.o ItemEffect.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Item.o $(pokemodDir)/Item.cpp
+
+ItemEffect.o : $(pokemodDir)/ItemEffect.h $(pokemodDir)/ItemEffect.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/ItemEffect.o $(pokemodDir)/ItemEffect.cpp
+
+ItemStorage.o : $(pokemodDir)/ItemStorage.h $(pokemodDir)/ItemStorage.cpp Object.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/ItemStorage.o $(pokemodDir)/ItemStorage.cpp
+
+Map.o : $(pokemodDir)/Map.h $(pokemodDir)/Map.cpp Object.o MapEffect.o MapTrainer.o MapWarp.o MapWildList.o String.o Matrix.h
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Map.o $(pokemodDir)/Map.cpp
+
+MapEffect.o : $(pokemodDir)/MapEffect.h $(pokemodDir)/MapEffect.cpp Object.o Dialog.o Flag.o String.o Path.o Point.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapEffect.o $(pokemodDir)/MapEffect.cpp
+
+MapTrainer.o : $(pokemodDir)/MapTrainer.h $(pokemodDir)/MapTrainer.cpp Object.o Dialog.o MapTrainerTeam.o Flag.o String.o Path.o Point.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapTrainer.o $(pokemodDir)/MapTrainer.cpp
+
+MapTrainerTeam.o : $(pokemodDir)/MapTrainerTeam.h $(pokemodDir)/MapTrainerTeam.cpp Object.o Pokemod.oItem.o Pokemon.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapTrainerTeam.o $(pokemodDir)/MapTrainerTeam.cpp
+
+MapWarp.o : $(pokemodDir)/MapWarp.h $(pokemodDir)/MapWarp.cpp Object.o Dialog.o Map.o Flag.o String.o Point.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapWarp.o $(pokemodDir)/MapWarp.cpp
+
+MapWildList.o : $(pokemodDir)/MapWildList.h $(pokemodDir)/MapWildList.cpp Object.o Pokemod.o MapWildPokemon.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapWildList.o $(pokemodDir)/MapWildList.cpp
+
+MapWildPokemon.o : $(pokemodDir)/MapWildPokemon.h $(pokemodDir)/MapWildPokemon.cpp Object.o Pokemod.o Pokemon.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MapWildPokemon.o $(pokemodDir)/MapWildPokemon.cpp
+
+Move.o : $(pokemodDir)/Move.h $(pokemodDir)/Move.cpp Object.o MoveEffect.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Move.o $(pokemodDir)/Move.cpp
+
+MoveEffect.o : $(pokemodDir)/MoveEffect.h $(pokemodDir)/MoveEffect.cpp Object.o Pokemod.o Frac.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/MoveEffect.o $(pokemodDir)/MoveEffect.cpp
+
+Nature.o : $(pokemodDir)/Nature.h $(pokemodDir)/Nature.cpp Object.o NatureEffect.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Nature.o $(pokemodDir)/Nature.cpp
+
+NatureEffect.o : $(pokemodDir)/NatureEffect.h $(pokemodDir)/NatureEffect.cpp Object.o Pokemod.o Frac.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/NatureEffect.o $(pokemodDir)/NatureEffect.cpp
+
+Object.o : $(pokemodDir)/Object.h $(pokemodDir)/Object.cpp Debug.o Ini.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Object.o $(pokemodDir)/Object.cpp
+
+Path.o : $(pokemodDir)/Path.h $(pokemodDir)/Path.cpp String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Path.o $(pokemodDir)/Path.cpp
+
+Point.o : $(pokemodDir)/Point.h $(pokemodDir)/Point.cpp Debug.o Ini.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Point.o $(pokemodDir)/Point.cpp
+
+Pokemod.o : $(pokemodDir)/Pokemod.h $(pokemodDir)/Pokemod.cpp $(pokemodDir)/pokemod_inc.h Object.o Ability.o Author.o Badge.o CoinList.o Dialog.o EggGroup.o Item.o OtemStorage.o Map.o Move.o Nature.o Pokemon.o Status.o Store.o Tile.o Time.o Type.o Frac.o Ini.o Path.o Point.o String.o Ref.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Pokemod.o $(pokemodDir)/Pokemod.cpp
+
+Pokemon.o : $(pokemodDir)/Pokemon.h $(pokemodDir)/Pokemon.cpp Object.o Pokemod.o PokemonAbility.o PokemonEvolution.o PokemonItem.o PokemonMove.o PokemonNature.o Frac.o Path.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Pokemon.o $(pokemodDir)/Pokemon.cpp
+
+PokemonAbility.o : $(pokemodDir)/PokemonAbility.h $(pokemodDir)/PokemonAbility.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/PokemonAbility.o $(pokemodDir)/PokemonAbility.cpp
+
+PokemonEvolution.o : $(pokemodDir)/PokemonEvolution.h $(pokemodDir)/PokemonEvolution.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/PokemonEvolution.o $(pokemodDir)/PokemonEvolution.cpp
+
+PokemonItem.o : $(pokemodDir)/PokemonItem.h $(pokemodDir)/PokemonItem.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/.o $(pokemodDir)/PokemonItem.cpp
+
+PokemonMove.o : $(pokemodDir)/PokemonMove.h $(pokemodDir)/PokemonMove.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/PokemonMove.o $(pokemodDir)/PokemonMove.cpp
+
+PokemonNature.o : $(pokemodDir)/PokemonNature.h $(pokemodDir)/PokemonNature.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/PokemonNature.o $(pokemodDir)/PokemonNature.cpp
+
+Ref.o : $(pokemodDir)/Ref.h $(pokemodDir)/Ref.cpp String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Ref.o $(pokemodDir)/Ref.cpp
+
+Status.o : $(pokemodDir)/Status.h $(pokemodDir)/Status.cpp Object.o Pokemod.o StatusEffect.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Status.o $(pokemodDir)/Status.cpp
+
+StatusEffect.o : $(pokemodDir)/StatusEffect.h $(pokemodDir)/StatusEffect.cpp Object.o Pokemod.o Ref.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/StatusEffect.o $(pokemodDir)/StatusEffect.cpp
+
+Store.o : $(pokemodDir)/Store.h $(pokemodDir)/Store.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Store.o $(pokemodDir)/Store.cpp
+
+String.o : $(pokemodDir)/String.h $(pokemodDir)/String.cpp
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/String.o $(pokemodDir)/String.cpp
+
+Tile.o : $(pokemodDir)/Tile.h $(pokemodDir)/Tile.cpp Object.o Pokemod.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Tile.o $(pokemodDir)/Tile.cpp
+
+Time.o : $(pokemodDir)/Time.h $(pokemodDir)/Time.cpp Object.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Time.o $(pokemodDir)/Time.cpp
+
+Type.o : $(pokemodDir)/Type.h $(pokemodDir)/Type.cpp Object.o String.o
+	g++ $(options) -c -o $(objDir)/$(pokemodDir)/Type.o $(pokemodDir)/Type.cpp
+
+cleanpokemod :
+	rm -f $(objDir)/$(pokemodDir)/*.o
+
+cleanall : cleanpokemod
+	rm -f ../obj/*.o