X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;fp=Makefile;h=d5dcd62cee0f50f283f594863628aa02b48a2e58;hb=cf3ec188764cdf34ff3472ee9806aba3a772d2df;hp=30e8c201e0034b305d0f9b331130493ec4625d87;hpb=0cdf0ebfb4b788156b8eb2c2acadd5f95fe5be26;p=ttedit

diff --git a/Makefile b/Makefile
index 30e8c20..d5dcd62 100755
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: ttedit
-# Generated by qmake (2.01a) (Qt 4.8.2) on: Fri Sep 14 09:37:18 2012
+# Generated by qmake (2.01a) (Qt 4.8.3) on: Sat Nov 17 12:34:10 2012
 # Project:  ttedit.pro
 # Template: app
 # Command: /usr/bin/qmake -o Makefile ttedit.pro
@@ -16,7 +16,7 @@ CXXFLAGS      = -pipe -O2 -D_REENTRANT -Wall -W $(DEFINES)
 INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -Iobj
 LINK          = g++
 LFLAGS        = -Wl,-O1
-LIBS          = $(SUBLIBS)  -L/usr/lib64/qt4 -lQtGui -L/usr/lib64 -L/usr/lib64/qt4 -L/usr/X11R6/lib -lQtCore -lglib-2.0 -lgthread-2.0 -lrt -lpthread 
+LIBS          = $(SUBLIBS)  -L/usr/lib64/qt4 -lQtGui -L/usr/lib64 -L/usr/lib64/qt4 -L/usr/X11R6/lib -lQtCore -lgthread-2.0 -lrt -lglib-2.0 -lpthread 
 AR            = ar cqs
 RANLIB        = 
 QMAKE         = /usr/bin/qmake
@@ -44,20 +44,20 @@ OBJECTS_DIR   = obj/
 ####### Files
 
 SOURCES       = src/ttedit.cpp \
-		src/ttemainwindow.cpp \
+		src/mainwindow.cpp \
 		src/editwindow.cpp \
 		src/glyphpoints.cpp \
 		src/debug.cpp \
 		src/toolwindow.cpp \
 		src/charwindow.cpp \
 		src/vector.cpp \
-		src/graphicprimitives.cpp obj/moc_ttemainwindow.cpp \
+		src/graphicprimitives.cpp obj/moc_mainwindow.cpp \
 		obj/moc_editwindow.cpp \
 		obj/moc_toolwindow.cpp \
 		obj/moc_charwindow.cpp \
 		obj/qrc_ttedit.cpp
 OBJECTS       = obj/ttedit.o \
-		obj/ttemainwindow.o \
+		obj/mainwindow.o \
 		obj/editwindow.o \
 		obj/glyphpoints.o \
 		obj/debug.o \
@@ -65,7 +65,7 @@ OBJECTS       = obj/ttedit.o \
 		obj/charwindow.o \
 		obj/vector.o \
 		obj/graphicprimitives.o \
-		obj/moc_ttemainwindow.o \
+		obj/moc_mainwindow.o \
 		obj/moc_editwindow.o \
 		obj/moc_toolwindow.o \
 		obj/moc_charwindow.o \
@@ -184,7 +184,7 @@ qmake:  FORCE
 
 dist: 
 	@$(CHK_DIR_EXISTS) obj/ttedit1.0.0 || $(MKDIR) obj/ttedit1.0.0 
-	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/ttedit1.0.0/ && $(COPY_FILE) --parents src/ttedit.h src/ttemainwindow.h src/editwindow.h src/glyphpoints.h src/types.h src/debug.h src/toolwindow.h src/charwindow.h src/vector.h src/graphicprimitives.h src/list.h obj/ttedit1.0.0/ && $(COPY_FILE) --parents ttedit.qrc obj/ttedit1.0.0/ && $(COPY_FILE) --parents src/ttedit.cpp src/ttemainwindow.cpp src/editwindow.cpp src/glyphpoints.cpp src/debug.cpp src/toolwindow.cpp src/charwindow.cpp src/vector.cpp src/graphicprimitives.cpp obj/ttedit1.0.0/ && (cd `dirname obj/ttedit1.0.0` && $(TAR) ttedit1.0.0.tar ttedit1.0.0 && $(COMPRESS) ttedit1.0.0.tar) && $(MOVE) `dirname obj/ttedit1.0.0`/ttedit1.0.0.tar.gz . && $(DEL_FILE) -r obj/ttedit1.0.0
+	$(COPY_FILE) --parents $(SOURCES) $(DIST) obj/ttedit1.0.0/ && $(COPY_FILE) --parents src/ttedit.h src/mainwindow.h src/editwindow.h src/glyphpoints.h src/types.h src/debug.h src/toolwindow.h src/charwindow.h src/vector.h src/graphicprimitives.h src/list.h obj/ttedit1.0.0/ && $(COPY_FILE) --parents ttedit.qrc obj/ttedit1.0.0/ && $(COPY_FILE) --parents src/ttedit.cpp src/mainwindow.cpp src/editwindow.cpp src/glyphpoints.cpp src/debug.cpp src/toolwindow.cpp src/charwindow.cpp src/vector.cpp src/graphicprimitives.cpp obj/ttedit1.0.0/ && (cd `dirname obj/ttedit1.0.0` && $(TAR) ttedit1.0.0.tar ttedit1.0.0 && $(COMPRESS) ttedit1.0.0.tar) && $(MOVE) `dirname obj/ttedit1.0.0`/ttedit1.0.0.tar.gz . && $(DEL_FILE) -r obj/ttedit1.0.0
 
 
 clean:compiler_clean 
@@ -205,11 +205,11 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
 
-compiler_moc_header_make_all: obj/moc_ttemainwindow.cpp obj/moc_editwindow.cpp obj/moc_toolwindow.cpp obj/moc_charwindow.cpp
+compiler_moc_header_make_all: obj/moc_mainwindow.cpp obj/moc_editwindow.cpp obj/moc_toolwindow.cpp obj/moc_charwindow.cpp
 compiler_moc_header_clean:
-	-$(DEL_FILE) obj/moc_ttemainwindow.cpp obj/moc_editwindow.cpp obj/moc_toolwindow.cpp obj/moc_charwindow.cpp
-obj/moc_ttemainwindow.cpp: src/ttemainwindow.h
-	/usr/bin/moc $(DEFINES) $(INCPATH) src/ttemainwindow.h -o obj/moc_ttemainwindow.cpp
+	-$(DEL_FILE) obj/moc_mainwindow.cpp obj/moc_editwindow.cpp obj/moc_toolwindow.cpp obj/moc_charwindow.cpp
+obj/moc_mainwindow.cpp: src/mainwindow.h
+	/usr/bin/moc $(DEFINES) $(INCPATH) src/mainwindow.h -o obj/moc_mainwindow.cpp
 
 obj/moc_editwindow.cpp: src/types.h \
 		src/toolwindow.h \
@@ -242,6 +242,7 @@ obj/qrc_ttedit.cpp: ttedit.qrc \
 		res/act-charwin.png \
 		res/act-forward.png \
 		res/cursor2.png \
+		res/cursor9.png \
 		res/cursor4.png
 	/usr/bin/rcc -name ttedit ttedit.qrc -o obj/qrc_ttedit.cpp
 
@@ -263,15 +264,15 @@ compiler_clean: compiler_moc_header_clean compiler_rcc_clean
 ####### Compile
 
 obj/ttedit.o: src/ttedit.cpp src/ttedit.h \
-		src/ttemainwindow.h
+		src/mainwindow.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ttedit.o src/ttedit.cpp
 
-obj/ttemainwindow.o: src/ttemainwindow.cpp src/ttemainwindow.h \
-		src/editwindow.h \
+obj/mainwindow.o: src/mainwindow.cpp src/mainwindow.h \
+		src/charwindow.h \
+		src/glyphpoints.h \
 		src/types.h \
+		src/editwindow.h \
 		src/toolwindow.h \
-		src/glyphpoints.h \
-		src/charwindow.h \
 		src/ttedit.h \
 		src/debug.h \
 		res/cur1.xpm \
@@ -286,17 +287,18 @@ obj/ttemainwindow.o: src/ttemainwindow.cpp src/ttemainwindow.h \
 		res/tool1.xpm \
 		res/tool2.xpm \
 		res/tool3.xpm
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ttemainwindow.o src/ttemainwindow.cpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/mainwindow.o src/mainwindow.cpp
 
 obj/editwindow.o: src/editwindow.cpp src/editwindow.h \
 		src/types.h \
 		src/toolwindow.h \
 		src/glyphpoints.h \
-		src/graphicprimitives.h \
-		src/debug.h \
-		src/vector.h \
 		src/charwindow.h \
-		src/ttedit.h
+		src/debug.h \
+		src/graphicprimitives.h \
+		src/mainwindow.h \
+		src/ttedit.h \
+		src/vector.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/editwindow.o src/editwindow.cpp
 
 obj/glyphpoints.o: src/glyphpoints.cpp src/glyphpoints.h \
@@ -324,8 +326,8 @@ obj/graphicprimitives.o: src/graphicprimitives.cpp src/graphicprimitives.h \
 		src/types.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/graphicprimitives.o src/graphicprimitives.cpp
 
-obj/moc_ttemainwindow.o: obj/moc_ttemainwindow.cpp 
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_ttemainwindow.o obj/moc_ttemainwindow.cpp
+obj/moc_mainwindow.o: obj/moc_mainwindow.cpp 
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_mainwindow.o obj/moc_mainwindow.cpp
 
 obj/moc_editwindow.o: obj/moc_editwindow.cpp 
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_editwindow.o obj/moc_editwindow.cpp