diff --git a/interface/Makefile b/interface/Makefile index 0a438671dd1eca6ec78a586f87a97d7507e5ecbe..f87e0bafbc6dec3b720a9f9712c3c020ecc3e009 100644 --- a/interface/Makefile +++ b/interface/Makefile @@ -6,15 +6,26 @@ FINAL=-03 all: cd ./src && qmake-qt4 -project "DESTDIR=../bin" "CONFIG+=uitools opengl" && qmake-qt4 -makefile -o Makefile src.pro && make all + mv src/*.o bin/ + @echo " " + @echo "Compilation completed! (release)" + @echo " " -debug: +debugs: cd ./src && qmake-qt4 -project && qmake-qt4 -makefile -o Makefile "CONFIG+=uitools opengl debug" "DESTDIR = ../debug" src.pro && make all + mv src/*.o bin/ + @echo " " + @echo "Compilation completed! (debug)" + @echo " " tests: all - cd ./test && make + cd ./tests && qmake-qt4 -project && qmake-qt4 -makefile -o Makefile "CONFIG+=uitools opengl debug" "DESTDIR = ../bin" tests.pro && make all + @echo " " + @echo "Compilation completed! (test)" + @echo " " clean: cd ./src && rm *~ *.o *pro Makefile \ No newline at end of file diff --git a/interface/test/Makefile b/interface/test/Makefile deleted file mode 100644 index cca7a1c8b22f6f2946dd9aaf5932e6b143db68ff..0000000000000000000000000000000000000000 --- a/interface/test/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -all: - $(CC) -c test_window_creation.cpp -o test_window_creation.o ../bin/interface_graphic.o \ No newline at end of file diff --git a/interface/tests/Makefile b/interface/tests/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..81ce556cc14819e3a5fc274d8edafaf2383d7a26 --- /dev/null +++ b/interface/tests/Makefile @@ -0,0 +1,227 @@ +############################################################################# +# Makefile for building: ../bin/tests +# Generated by qmake (2.01a) (Qt 4.4.3) on: Tue Jan 27 17:59:25 2009 +# Project: tests.pro +# Template: app +# Command: /usr/bin/qmake-qt4 -unix CONFIG+=uitools\ opengl\ debug DESTDIR\ =\ ../bin -o Makefile tests.pro +############################################################################# + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED +CFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES) +CXXFLAGS = -pipe -g -D_REENTRANT -Wall -W $(DEFINES) +INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtUiTools -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtXml -I/usr/include/qt4 -I. -I/usr/X11R6/include -I. -I. +LINK = g++ +LFLAGS = -Wl,--no-undefined +LIBS = $(SUBLIBS) -L/usr/X11R6/lib -L/usr/lib -lGLU -lGL -lQtXml -lQtGui -lQtCore -lQtUiTools -lpthread +AR = ar cqs +RANLIB = +QMAKE = /usr/bin/qmake-qt4 +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -sf +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = test_window_creation.cpp \ + test_window_destruction.cpp \ + ../src/interface_console.cpp \ + ../src/interface_graphic.cpp +OBJECTS = test_window_creation.o \ + test_window_destruction.o \ + interface_console.o \ + interface_graphic.o +DIST = /usr/share/qt4/mkspecs/common/g++.conf \ + /usr/share/qt4/mkspecs/common/unix.conf \ + /usr/share/qt4/mkspecs/common/linux.conf \ + /usr/share/qt4/mkspecs/qconfig.pri \ + /usr/share/qt4/mkspecs/features/qt_functions.prf \ + /usr/share/qt4/mkspecs/features/qt_config.prf \ + /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /usr/share/qt4/mkspecs/features/default_pre.prf \ + /usr/share/qt4/mkspecs/features/debug.prf \ + /usr/share/qt4/mkspecs/features/default_post.prf \ + /usr/share/qt4/mkspecs/features/unix/opengl.prf \ + /usr/share/qt4/mkspecs/features/qt.prf \ + /usr/share/qt4/mkspecs/features/uitools.prf \ + /usr/share/qt4/mkspecs/features/unix/thread.prf \ + /usr/share/qt4/mkspecs/features/moc.prf \ + /usr/share/qt4/mkspecs/features/warn_on.prf \ + /usr/share/qt4/mkspecs/features/resources.prf \ + /usr/share/qt4/mkspecs/features/uic.prf \ + /usr/share/qt4/mkspecs/features/yacc.prf \ + /usr/share/qt4/mkspecs/features/lex.prf \ + tests.pro +QMAKE_TARGET = tests +DESTDIR = ../bin/ +TARGET = ../bin/tests + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile $(TARGET) + +$(TARGET): $(OBJECTS) + @$(CHK_DIR_EXISTS) ../bin/ || $(MKDIR) ../bin/ + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +Makefile: tests.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \ + /usr/share/qt4/mkspecs/common/unix.conf \ + /usr/share/qt4/mkspecs/common/linux.conf \ + /usr/share/qt4/mkspecs/qconfig.pri \ + /usr/share/qt4/mkspecs/features/qt_functions.prf \ + /usr/share/qt4/mkspecs/features/qt_config.prf \ + /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /usr/share/qt4/mkspecs/features/default_pre.prf \ + /usr/share/qt4/mkspecs/features/debug.prf \ + /usr/share/qt4/mkspecs/features/default_post.prf \ + /usr/share/qt4/mkspecs/features/unix/opengl.prf \ + /usr/share/qt4/mkspecs/features/qt.prf \ + /usr/share/qt4/mkspecs/features/uitools.prf \ + /usr/share/qt4/mkspecs/features/unix/thread.prf \ + /usr/share/qt4/mkspecs/features/moc.prf \ + /usr/share/qt4/mkspecs/features/warn_on.prf \ + /usr/share/qt4/mkspecs/features/resources.prf \ + /usr/share/qt4/mkspecs/features/uic.prf \ + /usr/share/qt4/mkspecs/features/yacc.prf \ + /usr/share/qt4/mkspecs/features/lex.prf \ + /usr/lib/libQtXml.prl \ + /usr/lib/libQtGui.prl \ + /usr/lib/libQtCore.prl \ + /usr/lib/libQtUiTools.prl + $(QMAKE) -unix CONFIG+=uitools\ opengl\ debug DESTDIR\ =\ ../bin -o Makefile tests.pro +/usr/share/qt4/mkspecs/common/g++.conf: +/usr/share/qt4/mkspecs/common/unix.conf: +/usr/share/qt4/mkspecs/common/linux.conf: +/usr/share/qt4/mkspecs/qconfig.pri: +/usr/share/qt4/mkspecs/features/qt_functions.prf: +/usr/share/qt4/mkspecs/features/qt_config.prf: +/usr/share/qt4/mkspecs/features/exclusive_builds.prf: +/usr/share/qt4/mkspecs/features/default_pre.prf: +/usr/share/qt4/mkspecs/features/debug.prf: +/usr/share/qt4/mkspecs/features/default_post.prf: +/usr/share/qt4/mkspecs/features/unix/opengl.prf: +/usr/share/qt4/mkspecs/features/qt.prf: +/usr/share/qt4/mkspecs/features/uitools.prf: +/usr/share/qt4/mkspecs/features/unix/thread.prf: +/usr/share/qt4/mkspecs/features/moc.prf: +/usr/share/qt4/mkspecs/features/warn_on.prf: +/usr/share/qt4/mkspecs/features/resources.prf: +/usr/share/qt4/mkspecs/features/uic.prf: +/usr/share/qt4/mkspecs/features/yacc.prf: +/usr/share/qt4/mkspecs/features/lex.prf: +/usr/lib/libQtXml.prl: +/usr/lib/libQtGui.prl: +/usr/lib/libQtCore.prl: +/usr/lib/libQtUiTools.prl: +qmake: FORCE + @$(QMAKE) -unix CONFIG+=uitools\ opengl\ debug DESTDIR\ =\ ../bin -o Makefile tests.pro + +dist: + @$(CHK_DIR_EXISTS) .tmp/tests1.0.0 || $(MKDIR) .tmp/tests1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/tests1.0.0/ && $(COPY_FILE) --parents resource_test.h ../src/interface_console.h ../src/interface.h ../src/resource.h ../src/interface_graphic.h .tmp/tests1.0.0/ && $(COPY_FILE) --parents test_window_creation.cpp test_window_destruction.cpp ../src/interface_console.cpp ../src/interface_graphic.cpp .tmp/tests1.0.0/ && (cd `dirname .tmp/tests1.0.0` && $(TAR) tests1.0.0.tar tests1.0.0 && $(COMPRESS) tests1.0.0.tar) && $(MOVE) `dirname .tmp/tests1.0.0`/tests1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/tests1.0.0 + + +clean:compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +####### Sub-libraries + +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile + + +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: +compiler_moc_header_clean: +compiler_rcc_make_all: +compiler_rcc_clean: +compiler_image_collection_make_all: qmake_image_collection.cpp +compiler_image_collection_clean: + -$(DEL_FILE) qmake_image_collection.cpp +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: +compiler_uic_clean: +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: + +####### Compile + +test_window_creation.o: test_window_creation.cpp resource_test.h \ + ../src/interface_console.h \ + ../src/interface.h \ + ../src/resource.h \ + ../src/interface_graphic.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o test_window_creation.o test_window_creation.cpp + +test_window_destruction.o: test_window_destruction.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o test_window_destruction.o test_window_destruction.cpp + +interface_console.o: ../src/interface_console.cpp ../src/interface_console.h \ + ../src/interface.h \ + ../src/resource.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o interface_console.o ../src/interface_console.cpp + +interface_graphic.o: ../src/interface_graphic.cpp ../src/interface_graphic.h \ + ../src/interface.h \ + ../src/resource.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o interface_graphic.o ../src/interface_graphic.cpp + +####### Install + +install: FORCE + +uninstall: FORCE + +FORCE: + diff --git a/interface/test/README b/interface/tests/README similarity index 100% rename from interface/test/README rename to interface/tests/README diff --git a/interface/test/resource_test.h b/interface/tests/resource_test.h similarity index 84% rename from interface/test/resource_test.h rename to interface/tests/resource_test.h index 37c898d850f80823eeb338eec2ca31bdc546f238..64ecc3f824b70828c06463bd9c9d963ca7fd0bdd 100644 --- a/interface/test/resource_test.h +++ b/interface/tests/resource_test.h @@ -8,6 +8,7 @@ #define RESOURCE_TEST_H +#include "../src/interface_console.h" #include "../src/interface_graphic.h" diff --git a/interface/test/test_window_creation.cpp b/interface/tests/test_window_creation.cpp similarity index 100% rename from interface/test/test_window_creation.cpp rename to interface/tests/test_window_creation.cpp diff --git a/interface/test/test_window_destruction.cpp b/interface/tests/test_window_destruction.cpp similarity index 100% rename from interface/test/test_window_destruction.cpp rename to interface/tests/test_window_destruction.cpp