OSDN Git Service

(root) / lamexp / LameXP.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2350b42)
Updated the NC binary, re-compiled form latest sources with GCC v6.3.0.
authorLoRd_MuldeR <mulder2@gmx.de>
Sun, 2 Apr 2017 11:53:05 +0000 (13:53 +0200)
committerLoRd_MuldeR <mulder2@gmx.de>
Sun, 2 Apr 2017 11:53:05 +0000 (13:53 +0200)
12 files changed:
LameXP_VS2015.vcxproj patch | blob | history
LameXP_VS2015.vcxproj.filters patch | blob | history
res/Tools.nc-i386.qrc [deleted file] patch | blob | history
res/Tools.nc-x64.qrc [deleted file] patch | blob | history
res/Tools.netc.qrc [new file with mode: 0644] patch | blob
res/localization/LameXP_DE.qm patch | blob | history
res/tools/nc.i386.exe [deleted file] patch | blob | history
res/tools/nc.x64.exe [deleted file] patch | blob | history
res/tools/netc.exe [new file with mode: 0644] patch | blob
src/Config.h patch | blob | history
src/Dialog_Update.cpp patch | blob | history
src/Tools.h patch | blob | history

diff --git a/LameXP_VS2015.vcxproj b/LameXP_VS2015.vcxproj
index dc6cf8a..afa20d8 100644 (file)
--- a/LameXP_VS2015.vcxproj
+++ b/LameXP_VS2015.vcxproj
@@ -432,8 +432,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-avx.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-i386.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-sse2.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.nc-i386.cpp" />
-    <ClCompile Include="tmp\LameXP\QRC_Tools.nc-x64.cpp" />
+    <ClCompile Include="tmp\LameXP\QRC_Tools.netc.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggdec.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-i386.cpp" />
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggenc2-sse2.cpp" />
@@ -1498,30 +1497,6 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.nc-i386.qrc">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="res\Tools.nc-x64.qrc">
-      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
-    </CustomBuild>
     <CustomBuild Include="res\Tools.oggdec.qrc">
       <FileType>Document</FileType>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
@@ -1846,6 +1821,18 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="res\Tools.netc.qrc">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="LameXP.rc">
diff --git a/LameXP_VS2015.vcxproj.filters b/LameXP_VS2015.vcxproj.filters
index 0c26722..e24fc36 100644 (file)
--- a/LameXP_VS2015.vcxproj.filters
+++ b/LameXP_VS2015.vcxproj.filters
@@ -472,12 +472,6 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.mpg123-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.nc-i386.cpp">
-      <Filter>Generated Files\QRC</Filter>
-    </ClCompile>
-    <ClCompile Include="tmp\LameXP\QRC_Tools.nc-x64.cpp">
-      <Filter>Generated Files\QRC</Filter>
-    </ClCompile>
     <ClCompile Include="tmp\LameXP\QRC_Tools.oggdec.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
@@ -556,6 +550,9 @@
     <ClCompile Include="tmp\LameXP\QRC_Tools.faad-sse2.cpp">
       <Filter>Generated Files\QRC</Filter>
     </ClCompile>
+    <ClCompile Include="tmp\LameXP\QRC_Tools.netc.cpp">
+      <Filter>Generated Files\QRC</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Config.h">
@@ -962,12 +959,6 @@
     <CustomBuild Include="res\Tools.mpg123-sse2.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
-    <CustomBuild Include="res\Tools.nc-i386.qrc">
-      <Filter>Resources</Filter>
-    </CustomBuild>
-    <CustomBuild Include="res\Tools.nc-x64.qrc">
-      <Filter>Resources</Filter>
-    </CustomBuild>
     <CustomBuild Include="res\Tools.oggdec.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
@@ -1037,16 +1028,19 @@
     <CustomBuild Include="res\Tools.wvunpack-i386.qrc">
       <Filter>Resources</Filter>
     </CustomBuild>
+    <CustomBuild Include="res\Tools.faad-i386.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
+    <CustomBuild Include="res\Tools.faad-sse2.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
     <None Include="res\MainIcon.ico">
       <Filter>Miscellaneous</Filter>
     </None>
-    <None Include="res\Tools.faad-i386.qrc">
-      <Filter>Resources</Filter>
-    </None>
-    <None Include="res\Tools.faad-sse2.qrc">
+    <None Include="res\Tools.netcat.qrc">
       <Filter>Resources</Filter>
     </None>
   </ItemGroup>
diff --git a/res/Tools.nc-i386.qrc b/res/Tools.nc-i386.qrc
deleted file mode 100644 (file)
index 61aaf50..0000000
--- a/res/Tools.nc-i386.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/nc.i386.exe</file></qresource></RCC>
diff --git a/res/Tools.nc-x64.qrc b/res/Tools.nc-x64.qrc
deleted file mode 100644 (file)
index 6a55be7..0000000
--- a/res/Tools.nc-x64.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE RCC>
-<RCC version="1.0"><qresource><file>tools/nc.x64.exe</file></qresource></RCC>
diff --git a/res/Tools.netc.qrc b/res/Tools.netc.qrc
new file mode 100644 (file)
index 0000000..48668f7
--- /dev/null
+++ b/res/Tools.netc.qrc
@@ -0,0 +1,2 @@
+<!DOCTYPE RCC>
+<RCC version="1.0"><qresource><file>tools/netc.exe</file></qresource></RCC>
diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm
index 081e27b..47156c4 100644 (file)
Binary files a/res/localization/LameXP_DE.qm and b/res/localization/LameXP_DE.qm differ
diff --git a/res/tools/nc.i386.exe b/res/tools/nc.i386.exe
deleted file mode 100644 (file)
index 2119d68..0000000
Binary files a/res/tools/nc.i386.exe and /dev/null differ
diff --git a/res/tools/nc.x64.exe b/res/tools/nc.x64.exe
deleted file mode 100644 (file)
index 79bc027..0000000
Binary files a/res/tools/nc.x64.exe and /dev/null differ
diff --git a/res/tools/netc.exe b/res/tools/netc.exe
new file mode 100644 (file)
index 0000000..008ca52
Binary files /dev/null and b/res/tools/netc.exe differ
diff --git a/src/Config.h b/src/Config.h
index 67c82e3..e1e6470 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
 #define VER_LAMEXP_MINOR_LO                                    5
 #define VER_LAMEXP_TYPE                                                Beta
 #define VER_LAMEXP_PATCH                                       1
-#define VER_LAMEXP_BUILD                                       1964
+#define VER_LAMEXP_BUILD                                       1967
 #define VER_LAMEXP_CONFG                                       1934
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Dialog_Update.cpp b/src/Dialog_Update.cpp
index 9e6c524..0e0076d 100644 (file)
--- a/src/Dialog_Update.cpp
+++ b/src/Dialog_Update.cpp
@@ -84,7 +84,7 @@ UpdateDialog::UpdateDialog(const SettingsModel *const settings, QWidget *parent)
        m_updaterProcess(NULL),
        m_binaryUpdater(lamexp_tools_lookup("wupdate.exe")),
        m_binaryWGet(lamexp_tools_lookup("wget.exe")),
-       m_binaryNC(lamexp_tools_lookup("nc.exe")),
+       m_binaryNC(lamexp_tools_lookup("netc.exe")),
        m_binaryGnuPG(lamexp_tools_lookup("gpgv.exe")),
        m_binaryKeys(lamexp_tools_lookup("keyring.gpg"))
 {
diff --git a/src/Tools.h b/src/Tools.h
index ecefd42..5deac93 100644 (file)
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -92,8 +92,7 @@ g_lamexp_tools[] =
        {"d08097c7d310529b5b29268c3ecec436f8a55a28a8a524f09c1f94d6d47792f3aeae810353d0387352c2a487c5fd9225", CPU_TYPE_ALL_GEN, "mpg123.i386.exe", 1238, ""},
        {"1af626aaaacd67c4c5e4e1bc17dff298ba41b3d1466427b329a9850dee2455c35ca65d650b9abf5f87a93f8b7cf3348c", CPU_TYPE_ALL_SSE, "mpg123.sse2.exe", 1238, "" },
        {"ed1ad3df06f0de2924a63042901780e4055ed2963a3a348268aef711dfaa423e48bedbd6ba59bb798d1a1bb5c9384eaa", CPU_TYPE_ALL_AVX, "mpg123.avx.exe",  1238, "" },
-       {"1bfc01052abc76d492541f26bdc347f14ece180092e7128438f8f0f58879a7ed2aa66186c23429811ff5587b997cbeb7", CPU_TYPE_X86_ALL, "nc.i386.exe", 112, "" },
-       {"e7b19ec88fe025fd907a5ad85ed9c0b13cd33bd7cd04226d4f2944352f11d4026f558a30989f984e3e1d802552d05908", CPU_TYPE_X64_ALL, "nc.x64.exe", 112, "" },
+       {"15ad9c88684538d57dcb5e898bc59c9e7aba542702ecb1987de54b9f910d68a3121630828de45d1be424a90621af4363", CPU_TYPE_ALL_ALL, "netc.exe", 112, "" },
        {"f1f2ea5c9e5539620b706e7af68e543bf7a731afb06ccce3815ab34dad64d697e4d6ffcd187a396619b8b52efe7edf88", CPU_TYPE_ALL_ALL, "oggdec.exe", 1101, ""},
        {"245181321625445ac42fce31d64bf03872e77e2d0dd3c19d6c17ca2771354f096a6040827dd6d00ffd7342c7dd26168e", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 288135603, "2015"},
        {"512b8efcd1003a0f67220a450d6ea4466194e8fd49fc090a69b15a858db11499acbf98f984530cd5d37b4b6abdd1c6d8", CPU_TYPE_X86_SSX, "oggenc2.sse2.exe", 288135603, "2015"},
LameXP development repository
About OSDN
Find Software
Develop Software
Help