diff --git a/EET/bin/unix/lua b/EET/bin/unix/lua new file mode 100644 index 00000000..374fc84b Binary files /dev/null and b/EET/bin/unix/lua differ diff --git a/EET/bin/unix/x86_64/lua b/EET/bin/unix/x86_64/lua index e830b1e3..1b04e475 100644 Binary files a/EET/bin/unix/x86_64/lua and b/EET/bin/unix/x86_64/lua differ diff --git a/EET/bin/win32/lua.exe b/EET/bin/win32/lua.exe index dc9a1202..fb2fb370 100644 Binary files a/EET/bin/win32/lua.exe and b/EET/bin/win32/lua.exe differ diff --git a/EET/bin/win32/lua5.3.0.dll b/EET/bin/win32/lua5.3.0.dll deleted file mode 100644 index ca656104..00000000 Binary files a/EET/bin/win32/lua5.3.0.dll and /dev/null differ diff --git a/EET/bin/win32/lua53.dll b/EET/bin/win32/lua53.dll new file mode 100644 index 00000000..2ab8168a Binary files /dev/null and b/EET/bin/win32/lua53.dll differ diff --git a/EET/bin/win32/x86_64/lua.exe b/EET/bin/win32/x86_64/lua.exe index 7fe15b79..2aee067a 100644 Binary files a/EET/bin/win32/x86_64/lua.exe and b/EET/bin/win32/x86_64/lua.exe differ diff --git a/EET/bin/win32/x86_64/lua5.3.0.dll b/EET/bin/win32/x86_64/lua5.3.0.dll deleted file mode 100644 index 02495a80..00000000 Binary files a/EET/bin/win32/x86_64/lua5.3.0.dll and /dev/null differ diff --git a/EET/bin/win32/x86_64/lua53.dll b/EET/bin/win32/x86_64/lua53.dll new file mode 100644 index 00000000..92b90c9f Binary files /dev/null and b/EET/bin/win32/x86_64/lua53.dll differ diff --git a/EET/lib/EET_core.tp2 b/EET/lib/EET_core.tp2 index b67a9e7b..dd910227 100644 --- a/EET/lib/EET_core.tp2 +++ b/EET/lib/EET_core.tp2 @@ -148,21 +148,15 @@ END ELSE BEGIN //osx, unix OUTER_SPRINT arch_var ~x86_64/~ PRINT ~arch_var = %arch_var%~ END - END ELSE BEGIN //osx - AT_NOW ~chmod +x EET/bin/osx/ffmpeg~ EXACT - AT_NOW ~chmod +x EET/bin/osx/lua~ EXACT END + AT_NOW ~chmod +x EET/bin/%WEIDU_OS%/%arch_var%lua~ EXACT + AT_NOW ~chmod +x EET/bin/%WEIDU_OS%/%arch_var%ffmpeg~ EXACT AT_NOW ~chmod +x EET/bin/%WEIDU_OS%/%arch_var%tileconv~ EXACT AT_NOW ~chmod +x EET/bin/%WEIDU_OS%/%arch_var%tile2ee~ EXACT END -ACTION_IF ~%WEIDU_OS%~ STR_EQ ~unix~ BEGIN - OUTER_SPRINT lua ~lua~ - OUTER_SPRINT ffmpeg ~ffmpeg~ -END ELSE BEGIN //win32, osx - OUTER_SPRINT lua ~%bin%EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%lua%exe%~ - OUTER_SPRINT ffmpeg ~%bin%EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%ffmpeg%exe%~ -END +OUTER_SPRINT lua ~%bin%EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%lua%exe%~ +OUTER_SPRINT ffmpeg ~%bin%EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%ffmpeg%exe%~ OUTER_SPRINT tileconv ~%bin%EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%tileconv%exe%~ OUTER_SPRINT tile2ee ~%bin%EET%os_slash%bin%os_slash%%WEIDU_OS%%os_slash%%arch_var%tile2ee%exe%~