summaryrefslogtreecommitdiff
path: root/programs
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2017-04-15 21:25:39 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2017-04-15 21:25:39 +0000
commit6e75c93f2f94ac9c5c33f61f9963f2fa2e400b15 (patch)
tree9e8ad890edb9a7fb76427cd99e5a24e24d5d02af /programs
parenta19eddc34b6e8db043dbf6180c90e9bbe531dc03 (diff)
Notes
Diffstat (limited to 'programs')
-rw-r--r--programs/fileio.c2
-rw-r--r--programs/windres/generate_res.bat11
-rw-r--r--programs/windres/verrsrc.h8
-rw-r--r--programs/windres/zstd.rc51
-rw-r--r--programs/windres/zstd32.resbin1044 -> 0 bytes
-rw-r--r--programs/windres/zstd64.resbin1044 -> 0 bytes
6 files changed, 1 insertions, 71 deletions
diff --git a/programs/fileio.c b/programs/fileio.c
index e6481f1fa726..cabb6ec524a2 100644
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@ -138,7 +138,7 @@ static U32 g_dictIDFlag = 1;
void FIO_setDictIDFlag(unsigned dictIDFlag) { g_dictIDFlag = dictIDFlag; }
static U32 g_checksumFlag = 1;
void FIO_setChecksumFlag(unsigned checksumFlag) { g_checksumFlag = checksumFlag; }
-static U32 g_removeSrcFile = 0;
+static U32 g_removeSrcFile = 1;
void FIO_setRemoveSrcFile(unsigned flag) { g_removeSrcFile = (flag>0); }
static U32 g_memLimit = 0;
void FIO_setMemLimit(unsigned memLimit) { g_memLimit = memLimit; }
diff --git a/programs/windres/generate_res.bat b/programs/windres/generate_res.bat
deleted file mode 100644
index 53891050ba29..000000000000
--- a/programs/windres/generate_res.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-REM http://stackoverflow.com/questions/708238/how-do-i-add-an-icon-to-a-mingw-gcc-compiled-executable
-
-where /q windres.exe
-IF ERRORLEVEL 1 (
- ECHO The windres.exe is missing. Ensure it is installed and placed in your PATH.
- EXIT /B
-) ELSE (
- windres.exe -I ../lib -I windres -i windres/zstd.rc -O coff -F pe-x86-64 -o windres/zstd64.res
- windres.exe -I ../lib -I windres -i windres/zstd.rc -O coff -F pe-i386 -o windres/zstd32.res
-)
diff --git a/programs/windres/verrsrc.h b/programs/windres/verrsrc.h
deleted file mode 100644
index e282add025ac..000000000000
--- a/programs/windres/verrsrc.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* minimal set of defines required to generate zstd.res from zstd.rc */
-
-#define VS_VERSION_INFO 1
-
-#define VS_FFI_FILEFLAGSMASK 0x0000003FL
-#define VOS_NT_WINDOWS32 0x00040004L
-#define VFT_DLL 0x00000002L
-#define VFT2_UNKNOWN 0x00000000L
diff --git a/programs/windres/zstd.rc b/programs/windres/zstd.rc
deleted file mode 100644
index 4a8aef3b1392..000000000000
--- a/programs/windres/zstd.rc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-
-#include "zstd.h" /* ZSTD_VERSION_STRING */
-#define APSTUDIO_READONLY_SYMBOLS
-#include "verrsrc.h"
-#undef APSTUDIO_READONLY_SYMBOLS
-
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION ZSTD_VERSION_MAJOR,ZSTD_VERSION_MINOR,ZSTD_VERSION_RELEASE,0
- PRODUCTVERSION ZSTD_VERSION_MAJOR,ZSTD_VERSION_MINOR,ZSTD_VERSION_RELEASE,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE VFT2_UNKNOWN
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904B0"
- BEGIN
- VALUE "CompanyName", "Yann Collet, Facebook, Inc."
- VALUE "FileDescription", "Zstandard - Fast and efficient compression algorithm"
- VALUE "FileVersion", ZSTD_VERSION_STRING
- VALUE "InternalName", "zstd.exe"
- VALUE "LegalCopyright", "Copyright (c) 2013-present, Yann Collet, Facebook, Inc."
- VALUE "OriginalFilename", "zstd.exe"
- VALUE "ProductName", "Zstandard"
- VALUE "ProductVersion", ZSTD_VERSION_STRING
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0409, 1200
- END
-END
-
-#endif
diff --git a/programs/windres/zstd32.res b/programs/windres/zstd32.res
deleted file mode 100644
index b5dd78db717c..000000000000
--- a/programs/windres/zstd32.res
+++ /dev/null
Binary files differ
diff --git a/programs/windres/zstd64.res b/programs/windres/zstd64.res
deleted file mode 100644
index 32aff55428f0..000000000000
--- a/programs/windres/zstd64.res
+++ /dev/null
Binary files differ