revert link order adjustment (#201 )

The new order will lead to compilation failures when running 32-bit app on 64-bit devices. /eyerolling
Merge pull request #199 from PatriceJiang/v3.4.0-fix-android-compile-every-time
2021-12-16 11:51:30 +08:00 · 2021-12-08 09:40:25 +08:00 · 2021-12-08 09:36:41 +08:00
4 changed files with 8 additions and 5 deletions
@@ -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
@@ -58,10 +58,13 @@ target_include_directories(pvmp3dec PUBLIC
    ${CMAKE_CURRENT_LIST_DIR}/include
 )

-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h "#pragma once\n#define OSCL_UNUSED_ARG(x) (void)(x)")
+if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h)
+    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h "#pragma once\n#define OSCL_UNUSED_ARG(x) (void)(x)")
+endif()

 target_compile_options(pvmp3dec PRIVATE 
    #-fsanitize=signed-integer-overflow
    -include ${CMAKE_CURRENT_BINARY_DIR}/pvmp3dec_tmp_def.h
   #
-)
+)
+
@@ -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
@@ -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
Author	SHA1	Message	Date
Yun Hsiao WuandGitHub	a52c3279c3	revert link order adjustment (#201 ) The new order will lead to compilation failures when running 32-bit app on 64-bit devices. /eyerolling	2021-12-16 11:51:30 +08:00
江战andGitHub	7644ec1a9e	Merge pull request #199 from PatriceJiang/v3.4.0-fix-android-compile-every-time 3.4 skip modifying header file of pvmp3dec	2021-12-08 09:40:25 +08:00
PatriceJiang	101f8e780c	skip change header file of pvmp3dec	2021-12-08 09:36:41 +08:00