Config sources are now in main directory

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@230 416bcca6-2ee7-4201-b75f-2eb2f807beb1

Makefile

@@ -19,62 +19,71 @@
 #  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 # Windows specific
-ifdef COMSPEC
-DELCOMMAND = del
-BIN = grafx2.exe
-COPT = -Wall -O -g -ggdb -Dmain=SDL_main
-LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi
-CC = gcc
+  ifdef COMSPEC
+  DELCOMMAND = del
+  BIN = grafx2.exe
+  CFGBIN = gfxcfg.exe
+  COPT = -Wall -O -g -ggdb -Dmain=SDL_main
+  LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi
+  CC = gcc
 else
-# Linux specific
-DELCOMMAND = rm -rf
-ifdef WIN32CROSS
-#cross compile a Win32 executable
-CC = i586-mingw32msvc-gcc
-BIN = grafx2.exe
-COPT = -Wall -O -g -ggdb -Dmain=SDL_main
-LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi
-else
-BIN = grafx2
-COPT = -Wall -c -g
-LOPT = -lSDL -o $(BIN)
-CC = gcc
-endif
+  # Linux specific
+  DELCOMMAND = rm -rf
+  ifdef WIN32CROSS
+    #cross compile a Win32 executable
+    CC = i586-mingw32msvc-gcc
+    BIN = grafx2.exe
+    CFGBIN = gfxcfg.exe
+    COPT = -Wall -O -g -ggdb -Dmain=SDL_main
+    LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi
+  else
+    BIN = grafx2
+    CFGBIN = gfxcfg
+    COPT = -Wall -c -g
+    LOPT = -lSDL -o $(BIN)
+    CC = gcc
+  endif
 endif
 
 .PHONY : all debug release clean depend zip
 
 OBJ = main.o init.o graph.o sdlscreen.o divers.o special.o boutons.o palette.o aide.o operatio.o pages.o loadsave.o readline.o moteur.o files.o op_c.o linux.o op_asm.o readini.o saveini.o shade.o clavier.o io.o
+CFGOBJ = gfxcfg.o SFont.o clavier.o io.o
 
 OBJDIR = obj/
 
-all : $(BIN)
+all : $(BIN) $(CFGBIN)
 
 debug : $(BIN)
 
-release : $(BIN)
+release : $(BIN) $(CFGBIN)
 	strip $(BIN)
+	strip $(CFGBIN)
 
 # A raw source archive
 zip :
 	tar cvzf gfx2-src.tgz *.c *.h Makefile Makefile.dep gfx2.dat gfx2.ini gfx2.cfg doc/gpl-2.0.txt \
-    cfg_new/*.c cfg_new/*.h cfg_new/Makefile cfg_new/8pxfont.png 
+    8pxfont.png 
 
 # A release zip archive
 ziprelease:
-	zip grafx2-beta-svn`svnversion`.zip $(BIN) gfx2.dat gfx2.ico doc/gpl-2.0.txt SDL.dll gfx2.cfg
+	zip grafx2-beta-svn`svnversion`.zip $(BIN) $(CFGBIN) gfx2.dat gfx2.ico doc/gpl-2.0.txt SDL.dll gfx2.cfg
 
 $(BIN) : $(OBJ)
 	$(CC) $(OBJ) -o $(BIN) $(LOPT)
+
+$(CFGBIN) : $(CFGOBJ)
+	$(CC) $(CFGOBJ) -o $(CFGBIN) $(LOPT) -lSDL_image
 	
 %.o :
 	$(CC) $(COPT) -c $*.c -o $*.o
 
 depend :
-	$(CC) -MM $(OBJ:.o=.c) > Makefile.dep
+	$(CC) -MM $(OBJ:.o=.c) $(CFGOBJ:.o=.c) > Makefile.dep
 
 clean :
 	$(DELCOMMAND) *.o
 	$(DELCOMMAND) $(BIN)
+	$(DELCOMMAND) $(CFGBIN)
 
 include Makefile.dep

Makefile.dep

@@ -33,10 +33,12 @@ files.o: files.c const.h struct.h global.h loadsave.h graph.h divers.h \
 op_c.o: op_c.c op_c.h struct.h const.h op_asm.h erreurs.h
 linux.o: linux.c
 op_asm.o: op_asm.c op_c.h struct.h const.h graph.h
-readini.o: readini.c const.h global.h struct.h loadsave.h
+readini.o: readini.c const.h global.h struct.h loadsave.h graph.h
 saveini.o: saveini.c const.h global.h struct.h loadsave.h readini.h \
-  files.h erreurs.h
+  files.h erreurs.h graph.h
 shade.o: shade.c global.h struct.h const.h loadsave.h graph.h moteur.h \
   divers.h readline.h
 clavier.o: clavier.c global.h struct.h const.h loadsave.h
 io.o: io.c struct.h const.h io.h
+gfxcfg.o: gfxcfg.c SFont.h struct.h const.h clavier.h io.h
+SFont.o: SFont.c SFont.h

cfg_new/Makefile

@@ -1,42 +0,0 @@
-#  Grafx2 - The Ultimate 256-color bitmap paint program
-#  
-#  Copyright 2008 Adrien Destugues
-#  Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
-#  
-#  Grafx2 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; version 2
-#  of the License.
-#  
-#  Grafx2 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 Grafx2; if not, see <http://www.gnu.org/licenses/> or
-#  write to the Free Software Foundation, Inc.,
-#  59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-ifdef COMSPEC
-COPT = -Wall -O -g -ggdb -Dmain=SDL_main
-LOPT = `sdl-config --libs` -lSDL_image -g
-else
-COPT = -c `sdl-config --cflags` -Wall -g
-LOPT = `sdl-config --libs` -lSDL_image -lSDL_gfx -g
-endif
-
-gfxcfg: gfxcfg.o SFont.o ../clavier.o ../io.o
-	gcc gfxcfg.o ../clavier.o ../io.o SFont.o -o gfxcfg $(LOPT)
-
-gfxcfg.o: gfxcfg.c SFont.h
-	gcc -c gfxcfg.c -o gfxcfg.o $(COPT)
-
-../clavier.o:  ../clavier.c
-	gcc -c ../clavier.c -o ../clavier.o $(COPT)
-
-../io.o:  ../io.c
-	gcc -c ../io.c -o ../io.o $(COPT)
- 
-SFont.o: SFont.h SFont.c
-	gcc -c SFont.c -o SFont.o $(COPT)

gfxcfg.c

@@ -41,10 +41,10 @@
 #define MOD_CTRL  0x2000
 #define MOD_ALT   0x4000
 
-#include "../struct.h"
-#include "../clavier.h"
-#include "../const.h"
-#include "../io.h"
+#include "struct.h"
+#include "clavier.h"
+#include "const.h"
+#include "io.h"
 
 
 /*** Constants ***/