Skip to content

Commit 9f7556c

Browse files
Merge pull request #25 from simonmar/embedded_double_conversion
Optionally use an external double-conversion library
2 parents 99a5af6 + 79fb860 commit 9f7556c

File tree

2 files changed

+23
-9
lines changed

2 files changed

+23
-9
lines changed

cbits/hs-double-conversion.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
#ifdef EMBEDDED_DOUBLE_CONVERSION
12
#include "double-conversion.h"
3+
#else
4+
#include "double-conversion/double-conversion.h"
5+
#endif
26
#include "hs-double-conversion.h"
37
#include <stdio.h>
48

double-conversion.cabal

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,13 @@ flag developer
6565
default: False
6666
manual: True
6767

68+
flag embedded_double_conversion
69+
description: embed the C++ double_conversion library
70+
default: True
71+
6872
library
6973
c-sources:
7074
cbits/hs-double-conversion.cc
71-
double-conversion/src/bignum.cc
72-
double-conversion/src/bignum-dtoa.cc
73-
double-conversion/src/cached-powers.cc
74-
double-conversion/src/diy-fp.cc
75-
double-conversion/src/double-conversion.cc
76-
double-conversion/src/fast-dtoa.cc
77-
double-conversion/src/fixed-dtoa.cc
78-
double-conversion/src/strtod.cc
7975

8076
if os(windows)
8177
if arch(x86_64)
@@ -88,8 +84,22 @@ library
8884
else
8985
extra-libraries: stdc++
9086

87+
if flag(embedded_double_conversion)
88+
c-sources:
89+
double-conversion/src/bignum.cc
90+
double-conversion/src/bignum-dtoa.cc
91+
double-conversion/src/cached-powers.cc
92+
double-conversion/src/diy-fp.cc
93+
double-conversion/src/double-conversion.cc
94+
double-conversion/src/fast-dtoa.cc
95+
double-conversion/src/fixed-dtoa.cc
96+
double-conversion/src/strtod.cc
97+
cc-options: -DEMBEDDED_DOUBLE_CONVERSION
98+
include-dirs: double-conversion/src
99+
else
100+
extra-libraries: double-conversion
101+
91102
include-dirs:
92-
double-conversion/src
93103
include
94104

95105
exposed-modules:

0 commit comments

Comments
 (0)