onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-02 07:07:32 +02:00
Code Issues Releases Wiki Activity

removed more autogenerated files; need to set macro _WIN32_WINNT to make sure getaddrinfo is included. This means we support WinXP SP1 and later

Browse Source
This commit is contained in:
Vadim Kurland 2012-03-20 15:07:05 -07:00
parent 77fe7da636
commit 3d849c5388
4 changed files with 10 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.h.in
View File

@ -107,12 +107,18 @@ using namespace std;
#endif
#endif
#ifndef _WIN32
# define SNPRINTF snprintf
# define VSNPRINTF vsnprintf
#else
#ifdef _WIN32
# define SNPRINTF _snprintf
# define VSNPRINTF _vsnprintf
# define _WIN32_WINNT 0x0502
#else
# define SNPRINTF snprintf
# define VSNPRINTF vsnprintf
#endif

89
qmake.inc
View File

@ -1,89 +0,0 @@
#-*- mode: makefile; tab-width: 4; -*-
#
########## fwbuilder/qmake.inc.in
#
QTDIR = $$(QTDIR)
TEMPLATE = app
DEFINES += $$(DEFINES)
LANGUAGE = C++
UI_DIR = ui
MANDIR = /usr/local/share/man/
DOCDIR = /usr/local/share/doc/fwbuilder-5.1.0.3598
HAVE_QTDBUS = @HAVE_QTDBUS@
HAVE_CPPUNIT = 1
CPPUNIT_CFLAGS =
CPPUNIT_LIBS = -lcppunit -ldl
# CONFIG -= nostrip
# CONFIG += release
CONFIG += debug
unix {
PREFIX = /usr/local
ANTLR_INCLUDEPATH = /home/vadim/src/v4/build/source/fwbuilder/src/
ANTLR_LIBS = /home/vadim/src/v4/build/source/fwbuilder/src/antlr/libantlr.a
QMAKE_CXX = /usr/bin/ccache $$QMAKE_CXX
INCLUDEPATH += .. ../..
INCLUDEPATH += /usr/include/libxml2
LIBS += -pthread -lxml2 -L/usr/lib -lxslt -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp -lz -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp -lutil
UI_DIR = .ui
MOC_DIR = .moc
OBJECTS_DIR = .obj
QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
!macx {
exec_prefix = @EXEC_PREFIX@
DESTDIR =
ICONSDIR = /usr/local/share//icons/hicolor/
target.path = $$PREFIX/bin
dtd.path = /usr/local/share/fwbuilder-5.1.0.3598/
migration.path = /usr/local/share/fwbuilder-5.1.0.3598/migration
doc.path = /usr/local/share/doc/fwbuilder-5.1.0.3598
datadir.path = /usr/local/share/
res.path = /usr/local/share/fwbuilder-5.1.0.3598
res_os.path = $$res.path/os/
res_platform.path = $$res.path/platform/
res_help_C.path = $$res.path/help/C
res_help_en_US.path = $$res.path/help/en_US
res_desktop.path = /usr/local/share//applications/
res_configlets.path = $$res.path/configlets
# INSTALLS += icns
# LIBS += -lz -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp -lutil
PKGLOCALEDIR = $$res.path/locale
CONFIG += warn_on
# DEFINES += __STDC_FORMAT_MACROS
}
}
win32 {
CONFIG -= debug
}
FWB_SIG = $$(FWB_SIG)
if (isEmpty(FWB_SIG)) { FWB_SIG=26932 }
DEFINES += FWB_SIG=$$FWB_SIG
QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
exists(qmake2.inc) {
include(qmake2.inc)
}
INSTALLS += target

55
src/libfwbuilder/qmake.inc
View File

@ -1,55 +0,0 @@
#-*- mode: makefile; tab-width: 4; -*-
#
######### libfwbuilder/qmake.inc.in
#
QTDIR = $$(QTDIR)
TEMPLATE = lib
DEFINES += $$(DEFINES)
INCLUDEPATH += .. ../.. $$(INCLUDEPATH)
DEPENDPATH += .. ../..
LANGUAGE = C++
HAVE_CPPUNIT = 1
CPPUNIT_CFLAGS =
CPPUNIT_LIBS = -lcppunit -ldl
unix {
CONFIG += warn_on debug
UI_DIR = .ui
MOC_DIR = .moc
OBJECTS_DIR = .obj
prefix = /usr/local
QMAKE_CXX = /usr/bin/ccache $$QMAKE_CXX
# We put /usr/include into INCLUDEPATH to fix a problem compiling
# fwbuilder/snmp.cpp on freebsd.
INCLUDEPATH += /usr/include /usr/include/libxml2
LIBS += -pthread -lxml2 -L/usr/lib -lxslt -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp -lz -Wl,-Bsymbolic-functions -L/usr/lib -lnetsnmp -lutil
QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter -g -O2
QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter -g -O2
exec_prefix = @EXEC_PREFIX@
DESTDIR =
target.path = @LIBDIR@
dtd.path = /usr/local/share/fwbuilder-5.1.0.3598/
migration.path = /usr/local/share/fwbuilder-5.1.0.3598/migration
doc.path = /usr/local/share/doc/fwbuilder-5.1.0.3598
}
QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
exists(qmake2.inc) {
include( qmake2.inc)
}
CONFIG -= qt
INSTALLS += target

5
src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h.in
View File

@ -54,11 +54,6 @@
*/
#undef HAVE_SNPRINT_OBJID
#ifndef SNPRINTF
#define SNPRINTF snprintf
#define VSNPRINTF vsnprintf
#endif
#define FS_SEPARATOR "/"