Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Some Makefile improvements.

Browse Source
This commit is contained in:
LoRd_MuldeR 2017-08-19 19:36:17 +02:00
parent 4b0fef5e46
commit f19f2225a5
4 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etc/Deployment/_copy.bat Normal file
View File

@ -0,0 +1,21 @@
@echo off
:: ---------------------------------------------------------------------------
:: COPY FILE
:: ---------------------------------------------------------------------------
set "CP_SRC=%~1"
set "CP_DST=%~2"
"%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" white "copy \"%CP_SRC:\=\\%\" to \"%CP_DST:\=\\%\""
if not exist "%~1" (
"%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" red "\nCopy failed: Source file \"%CP_SRC:\=\\%\" not found!\n"
pause && exit
)
copy "%CP_SRC%" "%CP_DST%"
if not "%ERRORLEVEL%" == "0" (
"%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" red "\nCopy failed: Operation faild with error code %ERRORLEVEL%!\n"
pause && exit
)

31
etc/Deployment/make.bat
View File

@ -102,19 +102,21 @@ for %%i in (exe,sfx,zip,txt) do (
rd /S /Q "%TMP_PATH%" 2> NUL rd /S /Q "%TMP_PATH%" 2> NUL
mkdir "%TMP_PATH%" mkdir "%TMP_PATH%"
copy "%BIN_PATH%\LameXP.exe" "%TMP_PATH%" call "%~dp0\_copy.bat" "%BIN_PATH%\LameXP.exe" "%TMP_PATH%"
if "%LAMEXP_REDIST%"=="1" ( if "%LAMEXP_REDIST%"=="1" (
copy "%BIN_PATH%\MUtils32-?.dll" "%TMP_PATH%" call "%~dp0\_copy.bat" "%BIN_PATH%\LameXP.rcc" "%TMP_PATH%"
call "%~dp0\_copy.bat" "%BIN_PATH%\MUtils32-?.dll" "%TMP_PATH%"
mkdir "%TMP_PATH%\imageformats" mkdir "%TMP_PATH%\imageformats"
for %%i in (Core,Gui,Network,Xml,Svg) do ( for %%i in (Core,Gui,Network,Xml,Svg) do (
copy "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\bin\Qt%%i4.dll" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\bin\Qt%%i4.dll" "%TMP_PATH%"
) )
for %%i in (gif,ico,jpeg,mng,svg,tga,tiff) do ( for %%i in (gif,ico,jpeg,mng,svg,tga,tiff) do (
copy "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\plugins\imageformats\q%%i4.dll" "%TMP_PATH%\imageformats" call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\Qt4\v%PATH_VCTOOL%_xp\Shared\plugins\imageformats\q%%i4.dll" "%TMP_PATH%\imageformats"
) )
copy "%~dp0\..\..\..\Prerequisites\MSVC\redist\vc\v%PATH_VCTOOL%_xp\x86\*.dll" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\MSVC\redist\vc\v%PATH_VCTOOL%_xp\x86\*.dll" "%TMP_PATH%"
if %PATH_VCTOOL% GEQ 140 ( if %PATH_VCTOOL% GEQ 140 (
copy "%~dp0\..\..\..\Prerequisites\MSVC\redist\ucrt\DLLs\x86\*.dll" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\..\Prerequisites\MSVC\redist\ucrt\DLLs\x86\*.dll" "%TMP_PATH%"
) )
) )
@ -126,20 +128,19 @@ for %%e in (LameXP,Qt,MUtils) do (
) )
) )
copy "%~dp0\..\..\ReadMe.txt" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\ReadMe.txt" "%TMP_PATH%"
copy "%~dp0\..\..\License.txt" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\License.txt" "%TMP_PATH%"
copy "%~dp0\..\..\Copying.txt" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\Copying.txt" "%TMP_PATH%"
copy "%~dp0\..\..\doc\Changelog.html" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\doc\Changelog.html" "%TMP_PATH%"
copy "%~dp0\..\..\doc\Translate.html" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\doc\Translate.html" "%TMP_PATH%"
copy "%~dp0\..\..\doc\Manual.html" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\doc\Manual.html" "%TMP_PATH%"
copy "%~dp0\..\..\doc\FAQ.html" "%TMP_PATH%"
mkdir "%TMP_PATH%\img\lamexp" mkdir "%TMP_PATH%\img\lamexp"
copy "%~dp0\..\..\doc\img\lamexp\*.png" "%TMP_PATH%\img\lamexp" call "%~dp0\_copy.bat" "%~dp0\..\..\doc\img\lamexp\*.png" "%TMP_PATH%\img\lamexp"
if not "%VER_LAMEXP_TYPE%" == "Final" ( if not "%VER_LAMEXP_TYPE%" == "Final" (
if not "%VER_LAMEXP_TYPE%" == "Hotfix" ( if not "%VER_LAMEXP_TYPE%" == "Hotfix" (
copy "%~dp0\..\..\doc\PRE_RELEASE_INFO.txt" "%TMP_PATH%" call "%~dp0\_copy.bat" "%~dp0\..\..\doc\PRE_RELEASE_INFO.txt" "%TMP_PATH%"
) )
) )

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 6 #define VER_LAMEXP_MINOR_LO 6
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 3 #define VER_LAMEXP_PATCH 3
#define VER_LAMEXP_BUILD 2010 #define VER_LAMEXP_BUILD 2012
#define VER_LAMEXP_CONFG 2002 #define VER_LAMEXP_CONFG 2002
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

9
src/Global_Tools.cpp
View File

@ -208,8 +208,13 @@ void lamexp_initialize_resources(void)
#endif //!QT_NODLL #endif //!QT_NODLL
//Make sure resources are accessible! //Make sure resources are accessible!
if (!QResource(":/images/Logo.png").isValid()) static const char *const RESOURCES[] = { ":/images/Logo.png", ":/tools/lame.x86-i686.exe", NULL };
for (size_t i = 0U; RESOURCES[i]; ++i)
{ {
qFatal("Qt resource system initialization has failed!"); QResource resourceCheck(QString::fromLatin1(RESOURCES[i]));
if ((!resourceCheck.isValid()) || (resourceCheck.size() <= 0))
{
qFatal("Qt resource system initialization has failed:\nResource \"%s\" not found!", RESOURCES[i]);
}
} }
} }