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

diff --git a/winboard/makefile.gcc b/winboard/makefile.gcc
index 43fb4fe..8dc4a88 100644
--- a/winboard/makefile.gcc
+++ b/winboard/makefile.gcc
@@ -7,7 +7,7 @@ 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
+ wsockerr.o help.o settings.o
 
 
 # make compiling less spammy
@@ -18,10 +18,6 @@ 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
 
@@ -37,6 +33,7 @@ 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
+
 WARN = -Wall -Wno-char-subscripts -Wno-parentheses
 ARCH =
 ifeq ($(USE_DEBUG),0)
@@ -49,14 +46,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,8 +64,8 @@ $(PROJ).hlp : $(PROJ).rtf
 
 
 # Update the resource if necessary
-wbres.o: $(RESDEPS)
-	windres $(DEFS) --use-temp-file --include-dir .. $< -O coff -o $@
+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
@@ -168,5 +157,8 @@ book.o: ../book.c ../common.h ../backend.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, $<)
+
 %.o: %.c
 	$(call compile, $<)