diff options
| author | deva <deva> | 2006-07-25 16:35:23 +0000 |
|---|---|---|
| committer | deva <deva> | 2006-07-25 16:35:23 +0000 |
| commit | 4669a3517d6976a95978ac70de427b7f1c7cd3f8 (patch) | |
| tree | 00a2ce9e8e81ca48c1a8a0f1dec996ec156e17b9 | |
| parent | 1c0958e68fa58683ea4ceebc7cd20b5f1f747d3c (diff) | |
Moved the ETC and PIXMAPS symbols to config.h.
| -rw-r--r-- | client/Makefile.am | 6 | ||||
| -rw-r--r-- | client/aboutwindow.h | 3 | ||||
| -rw-r--r-- | client/cprquerydialog.h | 3 | ||||
| -rw-r--r-- | client/dvfile.h | 3 | ||||
| -rw-r--r-- | client/icons.cc | 3 | ||||
| -rw-r--r-- | client/messagebox.h | 3 | ||||
| -rw-r--r-- | client/miav_client.cc | 2 |
7 files changed, 18 insertions, 5 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 07b217e..0fad1ac 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,8 +1,4 @@ -AM_CXXFLAGS := -I../lib -L../lib \ - $(CXXFLAGS) $(EXTRA_CXXFLAGS) -I../include $(QT_CXXFLAGS) $(CAIRO_CXXFLAGS) \ - -DQT_THREAD_SUPPORT \ - -DPIXMAPS=\"$(datadir)/pixmaps\" \ - -DETC=\"$(prefix)/etc/miav\" +AM_CXXFLAGS := $(QT_CXXFLAGS) $(CAIRO_CXXFLAGS) -DQT_THREAD_SUPPORT bin_PROGRAMS = miav_client diff --git a/client/aboutwindow.h b/client/aboutwindow.h index f90911a..c992915 100644 --- a/client/aboutwindow.h +++ b/client/aboutwindow.h @@ -27,6 +27,9 @@ #ifndef __ABOUTWINDOW_H__ #define __ABOUTWINDOW_H__ +// For PIXMAPS +#include "config.h" + #include <QDialog> #include <QPixmap> #include <QPushButton> diff --git a/client/cprquerydialog.h b/client/cprquerydialog.h index 7c36b90..34e4078 100644 --- a/client/cprquerydialog.h +++ b/client/cprquerydialog.h @@ -27,6 +27,9 @@ #ifndef __MIAV_CPRQUERYDIALOG_H__ #define __MIAV_CPRQUERYDIALOG_H__ +// For PIXMAPS +#include "config.h" + /** * Text */ diff --git a/client/dvfile.h b/client/dvfile.h index b65dc36..9e21a4d 100644 --- a/client/dvfile.h +++ b/client/dvfile.h @@ -27,6 +27,9 @@ #ifndef __MIAV_DVFILE_H__ #define __MIAV_DVFILE_H__ +// For PIXMAPS +#include "config.h" + #include "frame_stream.h" #include <stdio.h> diff --git a/client/icons.cc b/client/icons.cc index 93fc137..9af894c 100644 --- a/client/icons.cc +++ b/client/icons.cc @@ -26,6 +26,9 @@ */ #include "icons.h" +// For PIXMAPS +#include "config.h" + /** * The image files */ diff --git a/client/messagebox.h b/client/messagebox.h index 332f9a0..6f97757 100644 --- a/client/messagebox.h +++ b/client/messagebox.h @@ -27,6 +27,9 @@ #ifndef __MIAV_MESSAGEBOX_H__ #define __MIAV_MESSAGEBOX_H__ +// For PIXMAPS +#include "config.h" + #include <QDialog> #include <QWidget> #include <QFrame> diff --git a/client/miav_client.cc b/client/miav_client.cc index a7f10b4..787859f 100644 --- a/client/miav_client.cc +++ b/client/miav_client.cc @@ -24,6 +24,8 @@ * along with MIaV; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include "config.h" + #include <QApplication> #include "mainwindow.h" |