X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fmakefile.gcc;h=a67f0999bf6ed3d81ca0fd5e15401e8b46c4c2d0;hb=18fe8fec4c8638dccb0c59c781a9ad900ddb3043;hp=43fb4fe0c993cd768616bc5d34e39bd5e31fa2db;hpb=9f8cbf9b523eef988a08309c58785590fd59fcb7;p=xboard.git

diff --git a/winboard/makefile.gcc b/winboard/makefile.gcc
index 43fb4fe..a67f099 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\
+ parser.o wbres.o wclipbrd.o wedittags.o wengineoutput.o wevalgraph.o\
  wgamelist.o whistory.o winboard.o wlayout.o woptions.o wsnap.o\
- wsockerr.o help.o
+ wsockerr.o help.o wsettings.o wchat.o engineoutput.o 
 
 
 # make compiling less spammy
@@ -37,6 +37,9 @@ 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)
@@ -49,14 +52,6 @@ CF = -c $(WARN) -pipe $(CFDEBUG) $(DEFS) -I. -I..
 CFLAGS = $(CF) $(ARCH) $(OPTS) $(CFCYG)
 LFLAGS = $(LFCYG) $(CFDEBUG) -fpic -s -mwindows -lwsock32 -lwinmm -lcomctl32
 
-# set up for JAWS
-RESDEPS = $(PROJ).rc $(PROJ).h resource.h
-ifeq ($(JAWS),1)
-  RESDEPS = jaws.rc resource.h jaws.h
-  DEFS += -DJAWS
-endif
-
-
 all: $(PROJ).exe
 
 
@@ -75,7 +70,7 @@ $(PROJ).hlp : $(PROJ).rtf
 
 
 # Update the resource if necessary
-wbres.o: $(RESDEPS)
+wbres.o: $(PROJ).rc $(PROJ).h resource.h
 	windres $(DEFS) --use-temp-file --include-dir .. $< -O coff -o $@
 
 
@@ -91,8 +86,8 @@ $(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
 	$(call compile, $<)
 
 backend.o: ../backend.c config.h ../common.h ../frontend.h ../backend.h \
@@ -119,19 +114,23 @@ wclipbrd.o: wclipbrd.c config.h ../common.h ../frontend.h ../backend.h \
 	$(call compile, $<)
 
 wedittags.o: wedittags.c config.h ../common.h winboard.h resource.h ../frontend.h \
-	../backend.h ../lists.h wedittags.h
+	../backend.h ../lists.h
 	$(call compile, $<)
 
 wgamelist.o: wgamelist.c config.h. ../common.h winboard.h resource.h ../frontend.h \
-	../backend.h wgamelist.h ../lists.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, $<)
 
-wengineo.o: wengineo.c config.h ../common.h ../frontend.h ../backend.h \
-	../lists.h winboard.h resource.h wsnap.h
+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 \
@@ -142,7 +141,7 @@ 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
+wlayout.o: wlayout.c config.h ../common.h ../frontend.h winboard.h resource.h
 	$(call compile, $<)
 
 wsockerr.o: wsockerr.c wsockerr.h
@@ -165,7 +164,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