From a52c3279c34d140adbcc4979c0e3afa934d264fc Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Thu, 16 Dec 2021 11:51:30 +0800 Subject: [PATCH] revert link order adjustment (#201) The new order will lead to compilation failures when running 32-bit app on 64-bit devices. /eyerolling --- android/CMakeLists.txt | 2 +- win32/CMakeLists.txt | 2 +- win64/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 2c01b41f..dfb6221d 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -105,7 +105,7 @@ endif() ############################# glslang ############################# -set(glslang_libs_name glslang glslang-default-resource-limits SPIRV MachineIndependent OGLCompiler OSDependent SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) +set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) foreach(lib IN LISTS glslang_libs_name) add_library(${lib} STATIC IMPORTED GLOBAL) set_target_properties(${lib} PROPERTIES diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt index ba47503b..39efe5ed 100644 --- a/win32/CMakeLists.txt +++ b/win32/CMakeLists.txt @@ -200,7 +200,7 @@ endif() ############################# glslang ############################# -set(glslang_libs_name glslang glslang-default-resource-limits SPIRV MachineIndependent OGLCompiler OSDependent SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) +set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) foreach(gl IN LISTS glslang_libs_name) add_library(${gl} STATIC IMPORTED GLOBAL) set_target_properties(${gl} PROPERTIES diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt index 317075bb..56e590ed 100644 --- a/win64/CMakeLists.txt +++ b/win64/CMakeLists.txt @@ -200,7 +200,7 @@ endif() ############################# glslang ############################# -set(glslang_libs_name glslang glslang-default-resource-limits SPIRV MachineIndependent OGLCompiler OSDependent SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) +set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) foreach(gl IN LISTS glslang_libs_name) add_library(${gl} STATIC IMPORTED GLOBAL) set_target_properties(${gl} PROPERTIES