onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-12 16:13:13 +02:00
Code Issues Releases Wiki Activity

fixed includes and other problems for win32

Browse Source
This commit is contained in:
SVN User
2008-07-13 00:29:05 +00:00
parent f8c7e323d1
commit 6150f13cdf
9 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qmake.inc
+2 -1
View File
@@ -9,7 +9,6 @@ TEMPLATE = app
SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@
DEFINES += $$(DEFINES) DEFINES += $$(DEFINES)
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
LANGUAGE = C++ LANGUAGE = C++
UI_DIR = ui UI_DIR = ui
MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/ MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/
@@ -35,6 +34,8 @@ unix {
exec_prefix = @EXEC_PREFIX@ exec_prefix = @EXEC_PREFIX@
DESTDIR = DESTDIR =
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
qmake.inc.in
+3 -2
View File
@@ -9,7 +9,6 @@ TEMPLATE = app
SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@
DEFINES += $$(DEFINES) DEFINES += $$(DEFINES)
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) @LIBFWBUILDER_INCLUDEPATH@
LANGUAGE = C++ LANGUAGE = C++
UI_DIR = ui UI_DIR = ui
MANDIR = @MANDIR@ MANDIR = @MANDIR@
@@ -35,6 +34,8 @@ unix {
exec_prefix = @EXEC_PREFIX@ exec_prefix = @EXEC_PREFIX@
DESTDIR = DESTDIR =
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) @LIBFWBUILDER_INCLUDEPATH@
LIBS_FWCOMPILER = @LIBFWBUILDER_LIBS_FWCOMPILER@ LIBS_FWCOMPILER = @LIBFWBUILDER_LIBS_FWCOMPILER@
LIBS_FWBUILDER = @LIBFWBUILDER_LIBS_FWBUILDER@ LIBS_FWBUILDER = @LIBFWBUILDER_LIBS_FWBUILDER@
@@ -71,7 +72,7 @@ unix {
} }
exists(qmake2.inc) { exists(qmake2.inc) {
include( qmake2.inc) include(qmake2.inc)
} }
INSTALLS += target INSTALLS += target
src/gui/ConfirmDeleteObjectDialog.h
+2 -1
View File
@@ -29,7 +29,8 @@
#include "config.h" #include "config.h"
#include <ui_confirmdeleteobjectdialog_q.h> #include <ui_confirmdeleteobjectdialog_q.h>
#include <FindWhereUsedWidget.h>
#include "FindWhereUsedWidget.h"
#include <vector> #include <vector>
#include <map> #include <map>
src/gui/FWObjectDrag.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "../../config.h" #include "../../config.h"
#include "global.h" #include "global.h"
#include <FWObjectDrag.h> #include "FWObjectDrag.h"
#include <fwbuilder/FWObject.h> #include <fwbuilder/FWObject.h>
//Added by qt3to4: //Added by qt3to4:
src/gui/ObjConflictResolutionDialog.h
+1 -1
View File
@@ -102,7 +102,7 @@ class CompareObjectsDialog :
std::list<QString> report; std::list<QString> report;
QStringList report_attributes; QStringList report_attributes;
int num_conflicts; int num_conflicts;
int column_width[]; int column_width[4];
void writeColumn(std::ostringstream &sstr, void writeColumn(std::ostringstream &sstr,
int column_num, int column_num,
src/gui/RCS.cpp
+2 -1
View File
@@ -27,13 +27,14 @@
#include "global.h" #include "global.h"
#include "utils.h" #include "utils.h"
#include "RCS.h"
// need this for FS_SEPARATOR // need this for FS_SEPARATOR
#include "fwbuilder/libfwbuilder-config.h" #include "fwbuilder/libfwbuilder-config.h"
#include "fwbuilder/Tools.h" #include "fwbuilder/Tools.h"
//#include "FWWindow.h" //#include "FWWindow.h"
#include <RCS.h>
#include <qdir.h> #include <qdir.h>
#include <qregexp.h> #include <qregexp.h>
#include <qmessagebox.h> #include <qmessagebox.h>
src/gui/RCSFilePreview.cpp
+2 -2
View File
@@ -26,8 +26,8 @@
#include "../../config.h" #include "../../config.h"
#include "global.h" #include "global.h"
#include <RCS.h> #include "RCS.h"
#include <RCSFilePreview.h> #include "RCSFilePreview.h"
#include "fwbuilder/libfwbuilder-config.h" #include "fwbuilder/libfwbuilder-config.h"
#include "fwbuilder/FWException.h" #include "fwbuilder/FWException.h"
src/gui/fwbuilder_ph.h
+5 -2
View File
@@ -1,5 +1,6 @@
#if defined(Q_OS_WIN32) #if 0
#if defined(_WIN32)
# include <stdio.h> # include <stdio.h>
# include <sys/timeb.h> # include <sys/timeb.h>
# include <windows.h> # include <windows.h>
@@ -9,6 +10,7 @@
# include <unistd.h> # include <unistd.h>
# include <pwd.h> # include <pwd.h>
#endif #endif
#endif
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
@@ -25,6 +27,8 @@
#include "global.h" #include "global.h"
#include "utils.h" #include "utils.h"
#include "fwbuilder/libfwbuilder-config.h"
#include "fwbuilder/Address.h" #include "fwbuilder/Address.h"
#include "fwbuilder/AddressRange.h" #include "fwbuilder/AddressRange.h"
#include "fwbuilder/AddressTable.h" #include "fwbuilder/AddressTable.h"
@@ -67,7 +71,6 @@
#include "fwbuilder/Tools.h" #include "fwbuilder/Tools.h"
#include "fwbuilder/UDPService.h" #include "fwbuilder/UDPService.h"
#include "fwbuilder/XMLTools.h" #include "fwbuilder/XMLTools.h"
#include "fwbuilder/libfwbuilder-config.h"
#include "fwbuilder/physAddress.h" #include "fwbuilder/physAddress.h"
// QT // QT
src/gui/instBatchOptionsDialog.h
+2 -1
View File
@@ -28,7 +28,8 @@
#define __INSTBATCHOPTIONSDIALOG_H_ #define __INSTBATCHOPTIONSDIALOG_H_
#include "config.h" #include "config.h"
#include <instOptionsDialog.h>
#include "instOptionsDialog.h"
class instConf; class instConf;