mirror of
https://github.com/tfussell/xlnt.git
synced 2024-03-22 13:11:17 +08:00
fix minor linux build issues
This commit is contained in:
parent
0e1358a502
commit
02e2dde4c7
23
build/genie/build-linux.sh
Executable file
23
build/genie/build-linux.sh
Executable file
|
@ -0,0 +1,23 @@
|
||||||
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
|
# use included genie if it isn't found in PATH
|
||||||
|
GENIE_BIN=$(which genie)
|
||||||
|
if [ -z "$GENIE_BIN" -o ! -x "$GENIE_BIN" ]; then
|
||||||
|
GENIE_BIN=$(pwd)"/genie-linux"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# default
|
||||||
|
ACTION="gmake"
|
||||||
|
if [ ! -z "$1" ]; then
|
||||||
|
ACTION="$1"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$ACTION" = "clean" ]]; then
|
||||||
|
rm -rf gmake
|
||||||
|
else
|
||||||
|
$GENIE_BIN $ACTION > /dev/null
|
||||||
|
if [[ "$ACTION" = "gmake" ]]; then
|
||||||
|
cd gmake
|
||||||
|
make
|
||||||
|
fi
|
||||||
|
fi
|
|
@ -26,7 +26,11 @@ project "xlnt.test"
|
||||||
configuration "windows"
|
configuration "windows"
|
||||||
defines { "WIN32" }
|
defines { "WIN32" }
|
||||||
links { "Shlwapi" }
|
links { "Shlwapi" }
|
||||||
configuration "not windows"
|
configuration "linux"
|
||||||
|
buildoptions {
|
||||||
|
"-std=c++1y"
|
||||||
|
}
|
||||||
|
configuration "macos"
|
||||||
buildoptions {
|
buildoptions {
|
||||||
"-std=c++14"
|
"-std=c++14"
|
||||||
}
|
}
|
||||||
|
@ -55,7 +59,11 @@ project "xlnt"
|
||||||
"WIN32",
|
"WIN32",
|
||||||
"_CRT_SECURE_NO_WARNINGS"
|
"_CRT_SECURE_NO_WARNINGS"
|
||||||
}
|
}
|
||||||
configuration "not windows"
|
configuration "linux"
|
||||||
|
buildoptions {
|
||||||
|
"-std=c++1y"
|
||||||
|
}
|
||||||
|
configuration "macos"
|
||||||
buildoptions {
|
buildoptions {
|
||||||
"-std=c++14"
|
"-std=c++14"
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include <xlnt/common/exceptions.hpp>
|
#include <xlnt/common/exceptions.hpp>
|
||||||
#include <xlnt/worksheet/range_reference.hpp>
|
#include <xlnt/worksheet/range_reference.hpp>
|
||||||
|
|
||||||
#include "constants.hpp"
|
#include "detail/constants.hpp"
|
||||||
|
|
||||||
namespace xlnt {
|
namespace xlnt {
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
#include <xlnt/common/datetime.hpp>
|
#include <xlnt/common/datetime.hpp>
|
||||||
#include <xlnt/common/exceptions.hpp>
|
#include <xlnt/common/exceptions.hpp>
|
||||||
#include <xlnt/common/zip_file.hpp>
|
#include <xlnt/common/zip_file.hpp>
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
#include <xlnt/cell/cell.hpp>
|
#include <xlnt/cell/cell.hpp>
|
||||||
|
#include <xlnt/styles/font.hpp>
|
||||||
|
#include <xlnt/styles/number_format.hpp>
|
||||||
|
#include <xlnt/styles/protection.hpp>
|
||||||
#include <xlnt/styles/style.hpp>
|
#include <xlnt/styles/style.hpp>
|
||||||
|
|
||||||
#include "font.hpp"
|
|
||||||
#include "number_format.hpp"
|
|
||||||
#include "protection.hpp"
|
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include <xlnt/workbook/workbook.hpp>
|
#include <xlnt/workbook/workbook.hpp>
|
||||||
#include <xlnt/writer/manifest_writer.hpp>
|
#include <xlnt/writer/manifest_writer.hpp>
|
||||||
|
|
||||||
#include "constants.hpp"
|
#include "detail/constants.hpp"
|
||||||
#include "detail/include_pugixml.hpp"
|
#include "detail/include_pugixml.hpp"
|
||||||
|
|
||||||
namespace xlnt {
|
namespace xlnt {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include <xlnt/common/relationship.hpp>
|
#include <xlnt/common/relationship.hpp>
|
||||||
#include <xlnt/writer/relationship_writer.hpp>
|
#include <xlnt/writer/relationship_writer.hpp>
|
||||||
|
|
||||||
#include "constants.hpp"
|
#include "detail/constants.hpp"
|
||||||
#include "detail/include_pugixml.hpp"
|
#include "detail/include_pugixml.hpp"
|
||||||
|
|
||||||
namespace xlnt {
|
namespace xlnt {
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include <xlnt/writer/worksheet_writer.hpp>
|
#include <xlnt/writer/worksheet_writer.hpp>
|
||||||
#include <xlnt/writer/workbook_writer.hpp>
|
#include <xlnt/writer/workbook_writer.hpp>
|
||||||
|
|
||||||
#include "constants.hpp"
|
#include "detail/constants.hpp"
|
||||||
#include "detail/include_pugixml.hpp"
|
#include "detail/include_pugixml.hpp"
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#include <xlnt/worksheet/worksheet.hpp>
|
#include <xlnt/worksheet/worksheet.hpp>
|
||||||
#include <xlnt/writer/worksheet_writer.hpp>
|
#include <xlnt/writer/worksheet_writer.hpp>
|
||||||
|
|
||||||
#include "constants.hpp"
|
#include "detail/constants.hpp"
|
||||||
#include "detail/include_pugixml.hpp"
|
#include "detail/include_pugixml.hpp"
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user