rob_linden / jsoncpp
Minor local mods needed for Linden Lab's use of jsoncpp.
Clone this repository (size: 693.9 KB): HTTPS / SSH
$ hg clone http://bitbucket.org/rob_linden/jsoncpp/
| commit 14: | ec2f16f568da |
| parent 13: | 3e5069ea5f02 |
| branch: | default |
| tags: | tip |
A couple of Mac fixups
ro...@rob-lanphiers-macbook-pro.local
6 months ago
Changed (Δ13 bytes):
raw changeset »
README-linden.txt (1 lines added, 1 lines removed)
SConstruct (1 lines added, 1 lines removed)
Up to file-list README-linden.txt:
| … | … | @@ -6,7 +6,7 @@ stock version provided with jsoncpp to m |
6 |
6 |
(in particular, /MD), and spit out lib names that won't be so confusing. |
7 |
7 |
|
8 |
8 |
Mac |
9 |
python scons.py platform=mac-universal |
|
9 |
python scons.py platform=mac-universal-gcc libs |
|
10 |
10 |
|
11 |
11 |
Linux: |
12 |
12 |
python scons.py platform=linux-gcc libs |
| … | … | @@ -85,7 +85,7 @@ options.Add( EnumVariable('platform', |
85 |
85 |
|
86 |
86 |
try: |
87 |
87 |
platform = ARGUMENTS['platform'] |
88 |
if platform == 'linux-gcc' or 'linux64-gcc' or platform == 'mac-universal |
|
88 |
if platform == 'linux-gcc' or 'linux64-gcc' or platform == 'mac-universal-gcc': |
|
89 |
89 |
CXX = 'g++' # not quite right, but env is not yet available. |
90 |
90 |
import commands |
91 |
91 |
version = commands.getoutput('%s -dumpversion' %CXX) |