X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fmakefile.gcc;h=92c2a6d2788733a7c8a3fd2b6eda5524d7f873e0;hb=e9c8ca5c16307c2366d4128507b57f7a0d4e6a2b;hp=b358337ddd214bb09e862c298bb545b23e5c4f9e;hpb=fe5678ecd51104c48452807ded1da1ddabad4999;p=xboard.git

diff --git a/winboard/makefile.gcc b/winboard/makefile.gcc
index b358337..92c2a6d 100644
--- a/winboard/makefile.gcc
+++ b/winboard/makefile.gcc
@@ -5,9 +5,9 @@ PROJ=winboard
 
 
 OBJS=backend.o book.o gamelist.o lists.o moves.o pgntags.o uci.o zippy.o\
- parser.o wbres.o wclipbrd.o wedittags.o wengineo.o wevalgraph.o\
- wgamelist.o whistory.o winboard.o wlayout.o woptions.o wsnap.o\
- wsockerr.o help.o
+ parser.o wbres.o wclipbrd.o wedittags.o wengineoutput.o wevalgraph.o\
+ wgamelist.o whistory.o history.o winboard.o wlayout.o woptions.o wsnap.o\
+ wsockerr.o help.o wsettings.o wchat.o engineoutput.o evalgraph.o
 
 
 # make compiling less spammy
@@ -18,22 +18,28 @@ compile = @echo "$1"; $(CC) $(CFLAGS) $1
 USE_DEBUG=0
 
 
+# JAWS support?
+JAWS=0
+
+
 # set this to 1 unless you don't mind linking with cygwin1.dll
 USE_MINGW=1
 
 
 # set up for cygwin or not
 ifeq ($(USE_MINGW),1)
-CFCYG = -mno-cygwin
+CFCYG = -mno-cygwin -DUSE_I64
 LFCYG = -mno-cygwin -lmsvcrt
 endif
 
-
 CC = gcc
 FLEX = "flex.exe" # we need version 2.5.4 or later, cygwin's is 2.5.35
 #      "c:/mingw/mingw32/bin/flex.exe"
 HC="C:/Program Files/Help Workshop/hcrtf" -xn
 DEFS = -D_WIN32_IE=0x0300 -DWIN32
+ifeq ($(JAWS),1)
+  DEFS += -DJAWS
+endif
 WARN = -Wall -Wno-char-subscripts -Wno-parentheses
 ARCH =
 ifeq ($(USE_DEBUG),0)
@@ -44,8 +50,7 @@ else
 endif
 CF = -c $(WARN) -pipe $(CFDEBUG) $(DEFS) -I. -I..
 CFLAGS = $(CF) $(ARCH) $(OPTS) $(CFCYG)
-LFLAGS = $(LFCYG) $(CFDEBUG) -fpic -s -mwindows -lwsock32 -lwinmm -lcomctl32
-
+LFLAGS = $(LFCYG) $(CFDEBUG) -fpic -s -mwindows -lwsock32 -lwinmm -lcomctl32 -lmsimg32
 
 all: $(PROJ).exe
 
@@ -58,22 +63,12 @@ clean:
 
 # Update the help file if necessary
 $(PROJ).hlp : $(PROJ).rtf
-	$(HC) $(PROJ).hpj
-	@cat $(PROJ).err
-	@mv $(PROJ).hlp tmp.hlp
-	@mv tmp.hlp $(PROJ).hlp # these moves to get the case right
+	$(HC) $(PROJ).hpj && @cat $(PROJ).err && @mv $(PROJ).hlp tmp.hlp && @mv tmp.hlp $(PROJ).hlp || true # these moves to get the case right
 
 
 # Update the resource if necessary
-wbres.o: $(PROJ).rc $(PROJ).h resource.h
-	windres --use-temp-file --include-dir .. $< -O coff -o $@
-
-
-# note: cygwin flex needs m4 package.  cygwin-setup forgets this dependency
-# note2: use mingw flex instead... although I got cygwin's flex working (with m4),
-#        it didn't produce a useable parser.c (1000's of errors)
-parser.c: ../parser.l
-	$(FLEX) -oparser.c -L ../parser.l
+wbres.o: $(PROJ).rc $(PROJ).h resource.h config.h
+	windres $(DEFS) --use-temp-file --include-dir .. $< -O coff -o $@
 
 
 $(PROJ).exe: $(OBJS) $(PROJ).hlp
@@ -81,15 +76,15 @@ $(PROJ).exe: $(OBJS) $(PROJ).hlp
 
 
 winboard.o: winboard.c config.h winboard.h ../common.h ../frontend.h ../backend.h \
-	../moves.h wgamelist.h defaults.h resource.h wclipbrd.h \
-	wedittags.h wsockerr.h woptions.h wsnap.h ../lists.h help.h
+	../moves.h defaults.h resource.h wclipbrd.h \
+	wsockerr.h woptions.h wsnap.h ../lists.h help.h ../args.h
 	$(call compile, $<)
 
 backend.o: ../backend.c config.h ../common.h ../frontend.h ../backend.h \
 	../parser.h ../moves.h ../zippy.h ../backendz.h ../gettext.h ../lists.h
 	$(call compile, $<)
 
-parser.o: parser.c config.h ../common.h ../backend.h ../parser.h \
+parser.o: ../parser.c config.h ../common.h ../backend.h ../parser.h \
 	../frontend.h ../moves.h ../lists.h
 	$(call compile, $<)
 
@@ -101,50 +96,62 @@ lists.o: ../lists.c config.h ../lists.h ../common.h
 	$(call compile, $<)
 
 gamelist.o: ../gamelist.c config.h ../lists.h ../common.h ../frontend.h \
-	../backend.h ../parser.h
-	$(call compile, $<)
-
-wclipbrd.o: wclipbrd.c config.h ../common.h ../frontend.h ../backend.h \
-	winboard.h resource.h wclipbrd.h ../lists.h
-	$(call compile, $<)
-
-wedittags.o: wedittags.c config.h ../common.h winboard.h resource.h ../frontend.h \
-	../backend.h ../lists.h wedittags.h
-	$(call compile, $<)
-
-wgamelist.o: wgamelist.c config.h. ../common.h winboard.h resource.h ../frontend.h \
-	../backend.h wgamelist.h ../lists.h
-	$(call compile, $<)
-
-woptions.o: woptions.c config.h ../common.h ../frontend.h ../backend.h ../lists.h \
-	defaults.h winboard.h resource.h
-	$(call compile, $<)
-
-wengineo.o: wengineo.c config.h ../common.h ../frontend.h ../backend.h \
-	../lists.h winboard.h resource.h wsnap.h
-	$(call compile, $<)
-
-whistory.o: whistory.c config.h ../common.h ../frontend.h ../backend.h \
-	../lists.h winboard.h resource.h wsnap.h
-	$(call compile, $<)
-
-wevalgraph.o: wevalgraph.c config.h ../common.h ../frontend.h ../backend.h \
-	../lists.h winboard.h resource.h wsnap.h
-	$(call compile, $<)
-
-wlayout.o: wlayout.c config.h ../common.h winboard.h resource.h
-	$(call compile, $<)
-
-wsockerr.o: wsockerr.c wsockerr.h
-	$(call compile, $<)
-
-help.o: help.c help.h
-	$(call compile, $<)
-
-wsnap.o: wsnap.c wsnap.h
-	$(call compile, $<)
-
-pgntags.o: ../pgntags.c config.h ../common.h ../frontend.h ../backend.h \
+	../backend.h ../parser.h
+	$(call compile, $<)
+
+wclipbrd.o: wclipbrd.c config.h ../common.h ../frontend.h ../backend.h \
+	winboard.h resource.h wclipbrd.h ../lists.h
+	$(call compile, $<)
+
+wedittags.o: wedittags.c config.h ../common.h winboard.h resource.h ../frontend.h \
+	../backend.h ../lists.h
+	$(call compile, $<)
+
+wgamelist.o: wgamelist.c config.h ../common.h winboard.h resource.h ../frontend.h \
+	../backend.h ../lists.h
+	$(call compile, $<)
+
+woptions.o: woptions.c config.h ../common.h ../frontend.h ../backend.h ../lists.h \
+	defaults.h winboard.h resource.h
+	$(call compile, $<)
+
+wengineoutput.o: wengineoutput.c ../engineoutput.h config.h ../common.h \
+	../frontend.h ../backend.h ../lists.h winboard.h resource.h wsnap.h
+	$(call compile, $<)
+
+engineoutput.o: ../engineoutput.c ../engineoutput.h config.h ../common.h \
+	../frontend.h ../backend.h ../lists.h
+	$(call compile, $<)
+
+whistory.o: whistory.c config.h ../common.h ../frontend.h ../backend.h \
+	../lists.h winboard.h resource.h wsnap.h
+	$(call compile, $<)
+
+history.o: ../history.c config.h ../common.h ../frontend.h ../backend.h \
+	../lists.h
+	$(call compile, $<)
+
+wevalgraph.o: wevalgraph.c ../evalgraph.h config.h ../common.h ../frontend.h \
+	../backend.h ../lists.h winboard.h resource.h wsnap.h
+	$(call compile, $<)
+
+evalgraph.o: ../evalgraph.c ../evalgraph.h config.h ../common.h ../frontend.h \
+	../backend.h ../lists.h
+	$(call compile, $<)
+
+wlayout.o: wlayout.c config.h ../common.h ../frontend.h winboard.h resource.h
+	$(call compile, $<)
+
+wsockerr.o: wsockerr.c wsockerr.h
+	$(call compile, $<)
+
+help.o: help.c help.h
+	$(call compile, $<)
+
+wsnap.o: wsnap.c wsnap.h
+	$(call compile, $<)
+
+pgntags.o: ../pgntags.c config.h ../common.h ../frontend.h ../backend.h \
 	../parser.h ../lists.h
 	$(call compile, $<)
 
@@ -155,7 +162,13 @@ zippy.o: ../zippy.c config.h ../common.h ../zippy.h ../frontend.h \
 book.o: ../book.c ../common.h ../backend.h ../lists.h
 	$(call compile, $<)
 
-uci.o: ../uci.c ..//common.h ../backend.h ../frontend.h ../lists.h
+uci.o: ../uci.c ../common.h ../backend.h ../frontend.h ../lists.h
+	$(call compile, $<)
+
+wsettings.o: wsettings.c ../common.h ../backend.h ../frontend.h ../lists.h
+	$(call compile, $<)
+
+wchat.o: wchat.c winboard.h wsnap.h ../common.h ../backend.h ../frontend.h ../lists.h
 	$(call compile, $<)
 
 %.o: %.c