Removed console on win32 unless, compiled in debug mode. First attempt on a macro dependency system.

1 files changed, 35 insertions, 27 deletions

diff --git a/client/client.pro b/client/client.pro
index 38279b8..772bbd3 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -1,5 +1,7 @@
 # -*- Makefile -*-
 
+CONFIG += debug
+
 TEMPLATE = app
 TARGET = pracro
 DEPENDPATH += . widgets
@@ -8,16 +10,20 @@ RESOURCES += client.qrc
 QT += core gui network xml sql
 
 # For debugging
-QMAKE_CXXFLAGS += -g -Wall -Werror
+debug {
+	QMAKE_CXXFLAGS += -g -Wall -Werror
+}
 
-DEFINES+=VERSION=\\\"1.0.1\\\"
+DEFINES+=VERSION=\\\"1.0.2\\\"
 
 win32 {
   LIBPATH += lua/lib
   INCLUDEPATH += lua/include
   LIBS += -llua51
   DEFINES += HOST_WIN32
-  CONFIG += console release
+	debug {
+	  CONFIG += console
+	}
 }
 
 unix {
@@ -26,21 +32,22 @@ unix {
 
 HEADERS += \
 	collapser.h \
-        formatparser.h \
-        lua.h \
-        macrowindow.h \
+	formatparser.h \
+	lua.h \
+	macro.h \
+	macrowindow.h \
 	mainwindow.h \
 	macrodrawer.h \
 	messagebox.h \
 	netcom.h \
 	resumewidget.h \
-        widgetbuilder.h \
-        widgets.h \
+	widgetbuilder.h \
+	widgets.h \
 	widgets/common.h \
 	widgets/widget.h \
 	widgets/label.h \
 	widgets/lineedit.h \
-        widgets/multilist.h \
+	widgets/multilist.h \
 	widgets/textedit.h \
 	widgets/button.h \
 	widgets/datetime.h \
@@ -53,39 +60,40 @@ HEADERS += \
 	widgets/radiobuttons.h \
 	widgets/checkbox.h \
 	widgets/window.h \
-        widgets/altcombobox.h \
+	widgets/altcombobox.h \
 	widgets/metawidget.h
 
 SOURCES += \
-        pracro.cc \
+	pracro.cc \
 	collapser.cc \
-        formatparser.cc \
-        lua.cc \
-        macrowindow.cc \
+	formatparser.cc \
+	lua.cc \
+	macro.cc \
+	macrowindow.cc \
 	mainwindow.cc \
 	macrodrawer.cc \
 	messagebox.cc \
 	netcom.cc \
 	resumewidget.cc \
-        widgetbuilder.cc \
+	widgetbuilder.cc \
 	widgets/common.cc \
-        widgets/widget.cc \
-        widgets/label.cc \
-        widgets/lineedit.cc \
-        widgets/multilist.cc \
-        widgets/textedit.cc \
-        widgets/button.cc \
-        widgets/combobox.cc \
+	widgets/widget.cc \
+	widgets/label.cc \
+	widgets/lineedit.cc \
+	widgets/multilist.cc \
+	widgets/textedit.cc \
+	widgets/button.cc \
+	widgets/combobox.cc \
 	widgets/datetime.cc	 \
 	widgets/dbwidget.cc	 \
 	widgets/listbox.cc \
-        widgets/frame.cc \
+	widgets/frame.cc \
 	widgets/groupbox.cc \
 	widgets/radiobutton.cc \
-        widgets/radiobuttons.cc \
-        widgets/checkbox.cc \
-        widgets/window.cc \
-        widgets/altcombobox.cc \
+	widgets/radiobuttons.cc \
+	widgets/checkbox.cc \
+	widgets/window.cc \
+	widgets/altcombobox.cc \
 	widgets/metawidget.cc
 
 TRANSLATIONS=pracro_dk.ts
\ No newline at end of file