X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=a8af53525c769321bfff41aaca875883a5bfc43d;hb=f8bd40b1a7da7d54a84afbc992fe289af85633a5;hp=77744df6faeb2a18bb3defa7a6a9dc5cc2625ab5;hpb=38fb522026b16fb83f49e2b2f32884ffaca177dd;p=ttedit

diff --git a/Makefile b/Makefile
old mode 100755
new mode 100644
index 77744df..a8af535
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 #############################################################################
 # Makefile for building: ttedit
-# Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Feb 6 15:32:02 2012
+# Generated by qmake (2.01a) (Qt 4.8.3) on: Tue Nov 20 15:23:38 2012
 # Project:  ttedit.pro
 # Template: app
-# Command: /usr/bin/qmake -unix -o Makefile ttedit.pro
+# Command: /usr/bin/qmake -o Makefile ttedit.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -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 \
@@ -152,7 +152,7 @@ Makefile: ttedit.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4
 		/usr/share/qt4/mkspecs/features/lex.prf \
 		/usr/lib64/qt4/libQtGui.prl \
 		/usr/lib64/qt4/libQtCore.prl
-	$(QMAKE) -unix -o Makefile ttedit.pro
+	$(QMAKE) -o Makefile ttedit.pro
 /usr/share/qt4/mkspecs/common/unix.conf:
 /usr/share/qt4/mkspecs/common/linux.conf:
 /usr/share/qt4/mkspecs/common/gcc-base.conf:
@@ -180,11 +180,11 @@ Makefile: ttedit.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4
 /usr/lib64/qt4/libQtGui.prl:
 /usr/lib64/qt4/libQtCore.prl:
 qmake:  FORCE
-	@$(QMAKE) -unix -o Makefile ttedit.pro
+	@$(QMAKE) -o Makefile ttedit.pro
 
 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 \
@@ -229,20 +229,20 @@ compiler_rcc_make_all: obj/qrc_ttedit.cpp
 compiler_rcc_clean:
 	-$(DEL_FILE) obj/qrc_ttedit.cpp
 obj/qrc_ttedit.cpp: ttedit.qrc \
-		res/cursor3.png \
-		res/toolpal1.xpm \
-		res/cursor5.png \
-		res/cursor1.png \
+		res/cursor-zoom.png \
+		res/cursor-add-point.png \
+		res/cursor-del-poly.png \
 		res/toolpal1.png \
+		res/cursor-add-poly.png \
+		res/cursor-rotate.png \
 		res/act-back.png \
 		res/ttedit.png \
-		res/cursor6.png \
-		res/cursor8.png \
-		res/cursor7.png \
+		res/cursor-del-point.png \
+		res/cursor-select-poly.png \
 		res/act-charwin.png \
 		res/act-forward.png \
-		res/cursor2.png \
-		res/cursor4.png
+		res/cursor-select.png \
+		res/cursor-scroll.png
 	/usr/bin/rcc -name ttedit ttedit.qrc -o obj/qrc_ttedit.cpp
 
 compiler_image_collection_make_all: obj/qmake_image_collection.cpp
@@ -263,40 +263,28 @@ 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 \
-		res/cur2.xpm \
-		res/cur3.xpm \
-		res/cur4.xpm \
-		res/cur5.xpm \
-		res/cur6.xpm \
-		res/cur7.xpm \
-		res/cur8.xpm \
-		res/ttedit.xpm \
-		res/tool1.xpm \
-		res/tool2.xpm \
-		res/tool3.xpm
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ttemainwindow.o src/ttemainwindow.cpp
+		src/ttedit.h
+	$(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 +312,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