Fixes to makefiles

Makefile

@@ -1,21 +1,37 @@
 include Rules.make
+include config.make
+
+VERTITLE := instead-$(VERSION)
+ARCHIVE := instead_$(VERSION).tar.gz
 
 SUBDIRS = src/sdl-instead stead games themes icon desktop doc languages 
 
-all:	config.make
+all:
 	@for dir in $(SUBDIRS); do \
 		$(MAKE) -C $$dir $(@) || exit 1; \
 	done;
 
+Rules.make:
+	ln -sf Rules.make.standalone Rules.make
+
 config.make:
 	echo "# you can define own flags here" > config.make
 
-include config.make
+svnclean:
+	svn st | grep "^?" | awk '{ print $$2 }' | grep -v "config.make" | while read l; do $(RM) -rf $$l; done
+
+tarball: clean
+	$(RM) -f Rules.make
+	ln -sf Rules.make.standalone Rules.make
+	ln -sf ./ $(VERTITLE)
+	tar -cz --exclude $(VERTITLE)/$(VERTITLE) --exclude .svn --exclude CVS --exclude $(ARCHIVE) -f $(ARCHIVE) $(VERTITLE)/*
+	$(RM) -f $(VERTITLE)
 
 clean:
 	@for dir in $(SUBDIRS); do \
 		$(MAKE) clean -C $$dir $(@) || exit 1; \
 	done;
+	$(RM) -f $(ARCHIVE)
 
 install: all
 ifeq ($(SYSTEMSETUP), yes)
@@ -35,3 +51,4 @@ ifeq ($(SYSTEMSETUP), yes)
 else
 	echo No uninstall needed
 endif
+

Rules.make

@@ -1 +0,0 @@
-Rules.make.standalone

Rules.make.standalone

@@ -1,4 +1,4 @@
-VERSION := \"1.0.0\"
+VERSION := 1.0.0
 
 DESTDIR=
 BIN=

Rules.make.system

@@ -1,4 +1,4 @@
-VERSION := \"1.0.0\"
+VERSION := 1.0.0
 
 PREFIX=/usr/local
 DESTDIR=

debian/docs

@@ -1,2 +0,0 @@
-readme.txt
-readme.txt

setup.iss

@@ -0,0 +1,73 @@
+[Setup]
+AppName=INSTEAD
+AppVerName=INSTEAD 1.0.0
+DefaultDirName={pf}\Pinebrush games\INSTEAD
+DefaultGroupName=Pinebrush games
+UninstallDisplayIcon={app}\sdl-instead.exe
+OutputDir=.
+OutputBaseFilename=instead-1.0.0
+AllowNoIcons=true
+
+[Languages]
+Name: en; MessagesFile: compiler:Default.isl
+Name: ru; MessagesFile: compiler:Languages\Russian.isl
+
+[Files]
+Source: sdl-instead.exe; DestDir: {app}
+Source: Microsoft.VC80.CRT\*; DestDir: {app}\Microsoft.VC80.CRT
+Source: games\cat\*; DestDir: {app}\games\cat
+Source: games\cat\gfx\*; DestDir: {app}\games\cat\gfx
+Source: games\cat\mus\*; DestDir: {app}\games\cat\mus
+Source: games\tutorial2\*; DestDir: {app}\games\tutorial2
+Source: games\tutorial2-en\*; DestDir: {app}\games\tutorial2-en
+Source: icon\*; DestDir: {app}\icon
+Source: doc\*; DestDir: {app}\doc
+Source: stead\*; DestDir: {app}\stead
+Source: languages\*; DestDir: {app}\languages
+Source: themes\default\*; DestDir: {app}\themes\default
+Source: themes\book\*; DestDir: {app}\themes\book
+Source: themes\original\*; DestDir: {app}\themes\original
+Source: themes\default-large\*; DestDir: {app}\themes\default-large
+Source: *.dll; DestDir: {app}
+
+[CustomMessages]
+CreateDesktopIcon=Create a &desktop icon
+LaunchGame=Launch &game
+UninstallMsg=Uninstall INSTEAD
+RmSettingsMsg=Would you like to remove settings and saved games?
+ru.CreateDesktopIcon=Ñîçäàòü &ÿðëûê íà ðàáî÷åì ñòîëå
+ru.LaunchGame=Çàïóñòèòü &èãðó
+ru.UninstallMsg=Óäàëèòü INSTEAD
+ru.RmSettingsMsg=Óäàëèòü íàñòðîéêè è ñîõðàí¸ííûå èãðû?
+ru.UninstalledAll=Ïðîãðàììà %1 áûëà óñïåøíî óäàëåíà ñ Âàøåãî êîìïüþòåðà.
+; "ïîëíîñòüþ óäàëåíà" -> "óñïåøíî óäàëåíà"
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}
+
+[Run]
+Filename: {app}\sdl-instead.exe; Description: {cm:LaunchGame}; WorkingDir: {app}; Flags: postinstall
+
+[Icons]
+Name: {commondesktop}\INSTEAD; Filename: {app}\sdl-instead.exe; WorkingDir: {app}; Tasks: desktopicon
+Name: {group}\INSTEAD; Filename: {app}\sdl-instead.exe; WorkingDir: {app}
+Name: {group}\{cm:UninstallMsg}; Filename: {uninstallexe}
+
+[UninstallDelete]
+Name: {app}; Type: dirifempty
+Name: {pf}\Pinebrush games; Type: dirifempty
+
+[Code]
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+begin
+  case CurUninstallStep of
+    usPostUninstall:
+      begin
+        if MsgBox(CustomMessage('RmSettingsMsg'), mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = idYes then
+        begin
+          // remove settings and saved games manually
+          DelTree(ExpandConstant('{localappdata}\instead'), True, True, True);
+        end;
+      end;
+  end;
+end;

src/sdl-instead/Makefile

@@ -1,7 +1,7 @@
 include ../../Rules.make
 include ../../config.make
 
-CFLAGS += $(SDL_CFLAGS) $(LUA_CFLAGS) -DLANG_PATH=\"${LANGPATH}/\" -DSTEAD_PATH=\"${STEADPATH}/\"  -DGAMES_PATH=\"${GAMESPATH}/\" -DTHEMES_PATH=\"${THEMESPATH}/\" -DVERSION=$(VERSION) -DICON_PATH=\"${ICONPATH}/\"
+CFLAGS += $(SDL_CFLAGS) $(LUA_CFLAGS) -DLANG_PATH=\"${LANGPATH}/\" -DSTEAD_PATH=\"${STEADPATH}/\"  -DGAMES_PATH=\"${GAMESPATH}/\" -DTHEMES_PATH=\"${THEMESPATH}/\" -DVERSION=\"$(VERSION)\" -DICON_PATH=\"${ICONPATH}/\"
 
 LDFLAGS += $(SDL_LFLAGS) $(LUA_LFLAGS)