summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-02-21 13:08:25 +0100
committerKonstantin Käfer <mail@kkaefer.com>2014-02-21 13:08:25 +0100
commit54735ddd9ee1c4f3403392bbacc9dc56c9d73995 (patch)
tree94949f7b0bf8e2f97f40800a47104ab8884f300e
parente382cab17dd399ef851a4a2800a11dd7b9a69c15 (diff)
downloadqtlocation-mapboxgl-54735ddd9ee1c4f3403392bbacc9dc56c9d73995.tar.gz
rename -osx project to -x86
-rw-r--r--Makefile2
-rw-r--r--linux/llmr-app.gyp2
-rw-r--r--llmr.gyp4
-rw-r--r--macosx/llmr-app.gyp2
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 0586f6017d..854b5fb81f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ V ?= 1
all: llmr
llmr: config.gypi src llmr.gyp
- $(MAKE) -C out BUILDTYPE=Release V=$(V) llmr-osx
+ $(MAKE) -C out BUILDTYPE=Release V=$(V) llmr-x86
# build OS X app with pure make
app: config.gypi src macosx/llmr-app.gyp
diff --git a/linux/llmr-app.gyp b/linux/llmr-app.gyp
index 40b8c76ecc..06d7ed822e 100644
--- a/linux/llmr-app.gyp
+++ b/linux/llmr-app.gyp
@@ -25,7 +25,7 @@
'<@(glfw3_cflags)'
],
"dependencies": [
- "../llmr.gyp:llmr-osx"
+ "../llmr.gyp:llmr-x86"
]
}
]
diff --git a/llmr.gyp b/llmr.gyp
index bd94746fa1..d6e4c71c67 100644
--- a/llmr.gyp
+++ b/llmr.gyp
@@ -5,8 +5,8 @@
],
'targets': [
{
- 'target_name': 'llmr-osx',
- 'product_name': 'llmr-osx',
+ 'target_name': 'llmr-x86',
+ 'product_name': 'llmr-x86',
'type': 'static_library',
'sources': [
'<!@(find src -name "*.cpp")',
diff --git a/macosx/llmr-app.gyp b/macosx/llmr-app.gyp
index 9b589c7230..09c2029f60 100644
--- a/macosx/llmr-app.gyp
+++ b/macosx/llmr-app.gyp
@@ -46,7 +46,7 @@
'CLANG_ENABLE_OBJC_ARC': 'YES'
},
"dependencies": [
- "../llmr.gyp:llmr-osx"
+ "../llmr.gyp:llmr-x86"
]
}
]