[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3063 - in gnunet-qt: . src/common src/core src/include src
From: |
durner |
Subject: |
[GNUnet-SVN] r3063 - in gnunet-qt: . src/common src/core src/include src/plugins/about src/plugins/fs src/plugins/general |
Date: |
Mon, 26 Jun 2006 12:09:01 -0700 (PDT) |
Author: durner
Date: 2006-06-26 12:08:46 -0700 (Mon, 26 Jun 2006)
New Revision: 3063
Modified:
gnunet-qt/configure.ac
gnunet-qt/src/common/common.pro.in
gnunet-qt/src/core/core.pro.in
gnunet-qt/src/include/gnunet_qt_common.h
gnunet-qt/src/plugins/about/about.pro.in
gnunet-qt/src/plugins/fs/fs.pro.in
gnunet-qt/src/plugins/general/general.pro.in
Log:
add "lib" prefix for Windows DLLs
Modified: gnunet-qt/configure.ac
===================================================================
--- gnunet-qt/configure.ac 2006-06-26 19:05:51 UTC (rev 3062)
+++ gnunet-qt/configure.ac 2006-06-26 19:08:46 UTC (rev 3063)
@@ -14,6 +14,16 @@
AC_CANONICAL_HOST
+# Check system type
+case "$host_os" in
+*cygwin* | *mingw*)
+ LIBPREFIX=lib
+ ;;
+*)
+ LIBPREFIX=
+;;
+esac
+
dnl Checks for programs.
AC_PROG_INSTALL
AC_PROG_CC
@@ -140,6 +150,8 @@
AC_MSG_ERROR([gnunet-qt requires Qt4])
fi
+AC_SUBST(LIBPREFIX)
+
AC_CONFIG_COMMANDS([qmake], [MINGW_IN_SHELL=1 qmake -unix -recursive])
AC_OUTPUT([
Modified: gnunet-qt/src/common/common.pro.in
===================================================================
--- gnunet-qt/src/common/common.pro.in 2006-06-26 19:05:51 UTC (rev 3062)
+++ gnunet-qt/src/common/common.pro.in 2006-06-26 19:08:46 UTC (rev 3063)
@@ -1,6 +1,5 @@
TEMPLATE = lib
-TARGET = gnunetqt_common
-win32:TARGET = libgnunetqt_common
+TARGET = @address@hidden
DLLDESTDIR = .
QMAKE_LFLAGS += -shared @LDFLAGS@
QMAKE_LIBS += @LIBS@
Modified: gnunet-qt/src/core/core.pro.in
===================================================================
--- gnunet-qt/src/core/core.pro.in 2006-06-26 19:05:51 UTC (rev 3062)
+++ gnunet-qt/src/core/core.pro.in 2006-06-26 19:08:46 UTC (rev 3063)
@@ -1,5 +1,5 @@
TEMPLATE = app
-TARGET = gnunet_qt
+TARGET = @address@hidden
DESTDIR = .
DEPENDPATH += .
INCLUDEPATH += ../include @top_builddir@ .
Modified: gnunet-qt/src/include/gnunet_qt_common.h
===================================================================
--- gnunet-qt/src/include/gnunet_qt_common.h 2006-06-26 19:05:51 UTC (rev
3062)
+++ gnunet-qt/src/include/gnunet_qt_common.h 2006-06-26 19:08:46 UTC (rev
3063)
@@ -49,7 +49,7 @@
public:
signals:
- virtual int setStatusText(const QPixmap *icon, const QString &strStatus);
+ int setStatusText(const QPixmap *icon, const QString &strStatus);
};
class GPluginLoader : public QObject
Modified: gnunet-qt/src/plugins/about/about.pro.in
===================================================================
--- gnunet-qt/src/plugins/about/about.pro.in 2006-06-26 19:05:51 UTC (rev
3062)
+++ gnunet-qt/src/plugins/about/about.pro.in 2006-06-26 19:08:46 UTC (rev
3063)
@@ -1,6 +1,5 @@
TEMPLATE = lib
-TARGET = gnunetqtmodule_about
-win32:TARGET = libgnunetqtmodule_about
+TARGET = @address@hidden
INCLUDEPATH = ../../../ ../../include .
DLLDESTDIR = .
LIBS = -L../../common -lgnunetqt_common
Modified: gnunet-qt/src/plugins/fs/fs.pro.in
===================================================================
--- gnunet-qt/src/plugins/fs/fs.pro.in 2006-06-26 19:05:51 UTC (rev 3062)
+++ gnunet-qt/src/plugins/fs/fs.pro.in 2006-06-26 19:08:46 UTC (rev 3063)
@@ -1,6 +1,5 @@
TEMPLATE = lib
-TARGET = gnunetqtmodule_fs
-win32:TARGET = libgnunetqtmodule_fs
+TARGET = @address@hidden
INCLUDEPATH = ../../include .
DLLDESTDIR = .
LIBS = -L../../common -lgnunetqt_common -lextractor -lgnunetutil
Modified: gnunet-qt/src/plugins/general/general.pro.in
===================================================================
--- gnunet-qt/src/plugins/general/general.pro.in 2006-06-26 19:05:51 UTC
(rev 3062)
+++ gnunet-qt/src/plugins/general/general.pro.in 2006-06-26 19:08:46 UTC
(rev 3063)
@@ -1,6 +1,5 @@
TEMPLATE = lib
-TARGET = gnunetqtmodule_general
-win32:TARGET = libgnunetqtmodule_general
+TARGET = @address@hidden
INCLUDEPATH = ../../include .
DLLDESTDIR = .
LIBS = -lgnunetutil -lgnunetgetoption_api -L../../common -lgnunetqt_common
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3063 - in gnunet-qt: . src/common src/core src/include src/plugins/about src/plugins/fs src/plugins/general,
durner <=