X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tools%2FDisplay%2FMakefile;h=18eb6aa70b75dd54a5c6f06ef7e9dbaebddf0111;hb=655b8062715746e7734a01c5a58d7d01e93caf94;hp=6195ed79864c4dce5e1e3e28012673f9ae8d6538;hpb=4b9c63b0ad3bac6407cf563e382746a7f5ba8aec;p=snark14.git

diff --git a/tools/Display/Makefile b/tools/Display/Makefile
old mode 100755
new mode 100644
index 6195ed7..18eb6aa
--- a/tools/Display/Makefile
+++ b/tools/Display/Makefile
@@ -1,4 +1,4 @@
-#############################################################################
+############################################################################
 # Makefile for building snark14Display (previously SnarkDisplay)
 # Generated by tmake at 13:46, 2002/12/19 
 #   fidgeted by Deniz 2004-2006
@@ -16,14 +16,15 @@ CFLAGS	=	-pipe -Wno-deprecated -O2 -DNO_DEBUG
 # CXXFLAGS=	-g -pipe -Wno-deprecated -Wall -W -O2 -std=c++98
 CXXFLAGS=	-pipe -Wno-deprecated -O2 -DNO_DEBUG -std=c++98
 
+QTDIR=/usr/local/qt3
 SNARK14ROOT = ../..
 SNARK14LIB = $(SNARK14ROOT)/lib
 SNARK14INC = $(SNARK14ROOT)/include
 
-XERCES = /usr/local/snark14
+XERCES = ../..
 XERCESLIBDIR= $(XERCES)/lib
 XERCESLIB = xerces-c
-XERCESINCLUDE = $(XERCES)/include/xercesc
+XERCESINCLUDE = $(XERCES)/include
 
 DIGLIBDIR = $(SNARK14LIB)
 
@@ -33,10 +34,10 @@ DIGFILEINCLUDE = $(SNARK14INC)/DIGFile
 DIGFILESNARKLIB = DIGFileSnark
 DIGFILESNARKINCLUDE = $(SNARK14INC)/DIGFileSnark
 
-INCPATH	=	-I$(QTDIR)/include -I$(XERCESINCLUDE)/.. -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE)
+INCPATH	=	-I$(QTDIR)/include -I$(XERCESINCLUDE) -I$(DIGFILEINCLUDE) -I$(DIGFILESNARKINCLUDE)
 LINK	=	$(CXX) -std=c++98
 LFLAGS	=	
-LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt-mt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
+LIBS	=	$(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(XERCESLIBDIR) -L$(DIGLIBDIR) -lqt -lm -l$(XERCESLIB) -l$(DIGFILELIB) -l$(DIGFILESNARKLIB)
 MOC	=	$(QTDIR)/bin/moc
 UIC	=	$(QTDIR)/bin/uic
 TAR	=	tar -cf