Fix folder structure for Xcode build.

desktop-app · Sep 18, 2019 · 85d6a5a · 85d6a5a
1 parent df28126
commit 85d6a5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/common/common.gypi b/common/common.gypi
@@ -49,7 +49,8 @@
       'official_build_target%': '',
       'build_standard_win%': 'c++17',
       'libs_loc%': '<(DEPTH)/../../../Libraries',
-      'submodules_loc%': '<(DEPTH)/../ThirdParty',
+      'submodules_loc%': '<(DEPTH)/..',
+      'third_party_loc%': '<(DEPTH)/../ThirdParty',
     },
     'build_os%': '<(build_os)',
     'build_win%': '<(build_win)',
@@ -59,6 +60,7 @@
     'build_standard_win%': '<(build_standard_win)',
     'libs_loc%': '<(libs_loc)',
     'submodules_loc%': '<(submodules_loc)',
+    'third_party_loc%': '<(third_party_loc)',
 
     # GYP does not support per-configuration libraries :(
     # So they will be emulated through additional link flags,

diff --git a/modules/qt.gypi b/modules/qt.gypi
@@ -198,14 +198,10 @@
   ],
   'conditions': [
     [ 'build_linux', {
-      'dependencies': [
-        '<(DEPTH)/linux_glibc_wraps.gyp:linux_glibc_wraps',
-      ],
       'library_dirs': [
         '<(qt_loc)/plugins/platforminputcontexts',
       ],
       'libraries': [
-        '<(PRODUCT_DIR)/obj.target/liblinux_glibc_wraps.a',
         '<(linux_path_xkbcommon)/lib/libxkbcommon.a',
         '<@(qt_libs_release)',
         '<(linux_lib_ssl)',