Permalink
Browse files

:P, Merge...

  • Loading branch information...
nycholas committed Aug 4, 2010
2 parents 6836c79 + fa43648 commit 42ba2794e27a23d85b73fcda72d0e33e2786eb1f
View
@@ -10,6 +10,7 @@ syntax: glob
*.log
*.bak
*.so
+*.user
*.o
*.obj
*.orig
@@ -23,11 +24,12 @@ syntax: glob
*_resouce.rc
.qmake.cache
*.prl
-tags
ui_*.h
*.cproject
*.project
-Makefile
-Makefile.Debug
-Makefile.Release
bin/c-project
+moc_*
+*.rcc
+*.uic
+*.obj
+*.moc
View
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: c-project
-# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 18:26:39 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 18:48:57 2010
# Project: c-project.pro
# Template: subdirs
# Command: /usr/bin/qmake -unix -o Makefile c-project.pro
View
5 README
@@ -1,6 +1,11 @@
== COMPLILE
+<<<<<<< HEAD
$ mysql -u root -p << doc/database/mysql/create-database.sql
$ qmake -r
+=======
+$ mysql -u root -p < resources/db/mysql/create-database.sql
+$ qmake -project "QT += sql" "UI_DIR = widgets" "OBJECTS_DIR = obj" "MOC_DIR = obj"
+>>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6
$ make
$ ./bin/c-project
View
@@ -0,0 +1,206 @@
+#############################################################################
+# Makefile for building: a3s
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Aug 4 10:37:56 2010
+# Project: bin.pro
+# Template: app
+# Command: /usr/bin/qmake -unix -o Makefile bin.pro
+#############################################################################
+
+####### Compiler, tools and options
+
+CC = gcc
+CXX = g++
+DEFINES = -DIDE_LIBRARY_BASENAME=\"lib\" -DQT_NO_CAST_TO_ASCII -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_FAST_CONCATENATION -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS = -m64 -pipe -march=x86-64 -mtune=generic -O2 -pipe -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS = -m64 -pipe -march=x86-64 -mtune=generic -O2 -pipe -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH = -I/usr/share/qt/mkspecs/linux-g++-64 -I. -I/usr/include/QtCore -I/usr/include/QtGui -I/usr/include -I../src -I/home/nycholas/project/src/o_lalertom/nycholas/src/nycholas/code/c++/gui/qt4/app-auth-and-session/bin/.moc/release-shared
+LINK = cp /home/nycholas/project/src/o_lalertom/nycholas/src/nycholas/code/c++/gui/qt4/app-auth-and-session/bin/a3s $@ && : IGNORE REST
+LFLAGS = -m64 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,--allow-shlib-undefined -Wl,--no-undefined -Wl,-O1
+LIBS = $(SUBLIBS) -L/usr/lib -L/home/nycholas/project/src/o_lalertom/nycholas/src/nycholas/code/c++/gui/qt4/app-auth-and-session/lib/a3s -lQtGui -lQtCore -lpthread
+AR = ar cqs
+RANLIB =
+QMAKE = /usr/bin/qmake
+TAR = tar -cf
+COMPRESS = gzip -9f
+COPY = cp -f
+SED = sed
+COPY_FILE = $(COPY)
+COPY_DIR = $(COPY) -r
+STRIP = strip
+INSTALL_FILE = install -m 644 -p
+INSTALL_DIR = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE = rm -f
+SYMLINK = ln -f -s
+DEL_DIR = rmdir
+MOVE = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR = ./
+
+####### Files
+
+SOURCES =
+OBJECTS =
+DIST = /usr/share/qt/mkspecs/common/g++.conf \
+ /usr/share/qt/mkspecs/common/unix.conf \
+ /usr/share/qt/mkspecs/common/linux.conf \
+ /usr/share/qt/mkspecs/qconfig.pri \
+ /usr/share/qt/mkspecs/features/qt_functions.prf \
+ /usr/share/qt/mkspecs/features/qt_config.prf \
+ /usr/share/qt/mkspecs/features/exclusive_builds.prf \
+ /usr/share/qt/mkspecs/features/default_pre.prf \
+ ../a3s.pri \
+ /usr/share/qt/mkspecs/features/release.prf \
+ /usr/share/qt/mkspecs/features/default_post.prf \
+ /usr/share/qt/mkspecs/features/warn_on.prf \
+ /usr/share/qt/mkspecs/features/qt.prf \
+ /usr/share/qt/mkspecs/features/unix/thread.prf \
+ /usr/share/qt/mkspecs/features/moc.prf \
+ /usr/share/qt/mkspecs/features/resources.prf \
+ /usr/share/qt/mkspecs/features/uic.prf \
+ /usr/share/qt/mkspecs/features/yacc.prf \
+ /usr/share/qt/mkspecs/features/lex.prf \
+ bin.pro
+QMAKE_TARGET = a3s
+DESTDIR =
+TARGET = a3s
+
+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): /home/nycholas/project/src/o_lalertom/nycholas/src/nycholas/code/c++/gui/qt4/app-auth-and-session/bin/a3s $(OBJECTS)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: bin.pro /usr/share/qt/mkspecs/linux-g++-64/qmake.conf /usr/share/qt/mkspecs/common/g++.conf \
+ /usr/share/qt/mkspecs/common/unix.conf \
+ /usr/share/qt/mkspecs/common/linux.conf \
+ /usr/share/qt/mkspecs/qconfig.pri \
+ /usr/share/qt/mkspecs/features/qt_functions.prf \
+ /usr/share/qt/mkspecs/features/qt_config.prf \
+ /usr/share/qt/mkspecs/features/exclusive_builds.prf \
+ /usr/share/qt/mkspecs/features/default_pre.prf \
+ ../a3s.pri \
+ /usr/share/qt/mkspecs/features/release.prf \
+ /usr/share/qt/mkspecs/features/default_post.prf \
+ /usr/share/qt/mkspecs/features/warn_on.prf \
+ /usr/share/qt/mkspecs/features/qt.prf \
+ /usr/share/qt/mkspecs/features/unix/thread.prf \
+ /usr/share/qt/mkspecs/features/moc.prf \
+ /usr/share/qt/mkspecs/features/resources.prf \
+ /usr/share/qt/mkspecs/features/uic.prf \
+ /usr/share/qt/mkspecs/features/yacc.prf \
+ /usr/share/qt/mkspecs/features/lex.prf \
+ /usr/lib/libQtGui.prl \
+ /usr/lib/libQtCore.prl
+ $(QMAKE) -unix -o Makefile bin.pro
+/usr/share/qt/mkspecs/common/g++.conf:
+/usr/share/qt/mkspecs/common/unix.conf:
+/usr/share/qt/mkspecs/common/linux.conf:
+/usr/share/qt/mkspecs/qconfig.pri:
+/usr/share/qt/mkspecs/features/qt_functions.prf:
+/usr/share/qt/mkspecs/features/qt_config.prf:
+/usr/share/qt/mkspecs/features/exclusive_builds.prf:
+/usr/share/qt/mkspecs/features/default_pre.prf:
+../a3s.pri:
+/usr/share/qt/mkspecs/features/release.prf:
+/usr/share/qt/mkspecs/features/default_post.prf:
+/usr/share/qt/mkspecs/features/warn_on.prf:
+/usr/share/qt/mkspecs/features/qt.prf:
+/usr/share/qt/mkspecs/features/unix/thread.prf:
+/usr/share/qt/mkspecs/features/moc.prf:
+/usr/share/qt/mkspecs/features/resources.prf:
+/usr/share/qt/mkspecs/features/uic.prf:
+/usr/share/qt/mkspecs/features/yacc.prf:
+/usr/share/qt/mkspecs/features/lex.prf:
+/usr/lib/libQtGui.prl:
+/usr/lib/libQtCore.prl:
+qmake: FORCE
+ @$(QMAKE) -unix -o Makefile bin.pro
+
+dist:
+ @$(CHK_DIR_EXISTS) .tmp/a3s1.0.0 || $(MKDIR) .tmp/a3s1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/a3s1.0.0/ && (cd `dirname .tmp/a3s1.0.0` && $(TAR) a3s1.0.0.tar a3s1.0.0 && $(COMPRESS) a3s1.0.0.tar) && $(MOVE) `dirname .tmp/a3s1.0.0`/a3s1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/a3s1.0.0
+
+
+clean:compiler_clean
+ -$(DEL_FILE) a3s
+ -$(DEL_FILE) *~ core *.core
+
+
+####### Sub-libraries
+
+distclean: clean
+ -$(DEL_FILE) $(TARGET)
+ -$(DEL_FILE) Makefile
+
+
+check: first
+
+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
+
+####### Install
+
+install_target: first FORCE
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/bin/ || $(MKDIR) $(INSTALL_ROOT)/bin/
+ -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/bin/$(QMAKE_TARGET)"
+ -$(STRIP) "$(INSTALL_ROOT)/bin/$(QMAKE_TARGET)"
+
+uninstall_target: FORCE
+ -$(DEL_FILE) "$(INSTALL_ROOT)/bin/$(QMAKE_TARGET)"
+ -$(DEL_DIR) $(INSTALL_ROOT)/bin/
+
+
+install: install_target FORCE
+
+uninstall: uninstall_target FORCE
+
+FORCE:
+
Oops, something went wrong.

0 comments on commit 42ba279

Please sign in to comment.