9931d736ed
This reverts commit d3d533c9e4.
Hard-coding -std=c++xy in one module is a bad idea.
None of these gccs give any spurious error in gnu++11 mode now:
gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2)
gcc (GCC) 4.7.0 20120507 (Red Hat 4.7.0-5)
49 lines
1.6 KiB
Text
49 lines
1.6 KiB
Text
#*************************************************************************
|
|
#
|
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
#
|
|
# Copyright 2008 by Sun Microsystems, Inc.
|
|
#
|
|
# OpenOffice.org - a multi-platform office productivity suite
|
|
#
|
|
# This file is part of OpenOffice.org.
|
|
#
|
|
# OpenOffice.org is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Lesser General Public License version 3
|
|
# only, as published by the Free Software Foundation.
|
|
#
|
|
# OpenOffice.org is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU Lesser General Public License version 3 for more details
|
|
# (a copy is included in the LICENSE file that accompanied this code).
|
|
#
|
|
# You should have received a copy of the GNU Lesser General Public License
|
|
# version 3 along with OpenOffice.org. If not, see
|
|
# <http://www.openoffice.org/license.html>
|
|
# for a copy of the LGPLv3 License.
|
|
#
|
|
#*************************************************************************
|
|
|
|
.IF "$(SYSTEM_MYSQL)" == "YES"
|
|
CFLAGS+=-DSYSTEM_MYSQL
|
|
.ELSE
|
|
.IF "$(LIBMYSQL_PATH)" == ""
|
|
alltar:
|
|
@echo "need to have LIBMYSQL_PATH set to the location where libmysql (also known as 'MySQL Connector/C') is installed"
|
|
@force_dmake_to_error
|
|
.ENDIF
|
|
.ENDIF
|
|
|
|
.IF "$(GUI)"=="WNT"
|
|
|
|
CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
|
|
|
|
.ENDIF # "$(GUI)"=="WNT"
|
|
|
|
.IF "$(SYSTEM_MYSQL)" != "YES"
|
|
MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include
|
|
.ENDIF
|
|
|
|
CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD
|
|
|