diff options
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/Makefile | 35 | ||||
| -rw-r--r-- | windows/common.rc | 46 | ||||
| -rw-r--r-- | windows/liblzma.rc | 5 | ||||
| -rw-r--r-- | windows/lzmadec.rc | 5 | ||||
| -rw-r--r-- | windows/xz.rc | 5 | ||||
| -rw-r--r-- | windows/xzdec.rc | 5 |
6 files changed, 19 insertions, 82 deletions
diff --git a/windows/Makefile b/windows/Makefile index 0ff45a81..db362ef2 100644 --- a/windows/Makefile +++ b/windows/Makefile @@ -104,7 +104,7 @@ pkg: all $(CP) ../src/liblzma/api/lzma.h pkg/include $(CP) ../src/liblzma/api/lzma/*.h pkg/include/lzma -%_rc.o: %.rc +%.o: %.rc $(WINDRES) $(ALL_CPPFLAGS) $< $@ @@ -196,7 +196,10 @@ endif LIBLZMA_OBJS_C = $(LIBLZMA_SRCS_C:.c=.o) LIBLZMA_OBJS_ASM = $(LIBLZMA_SRCS_ASM:.S=.o) -LIBLZMA_OBJS = $(LIBLZMA_OBJS_C) $(LIBLZMA_OBJS_ASM) liblzma_rc.o +LIBLZMA_OBJS = \ + $(LIBLZMA_OBJS_C) \ + $(LIBLZMA_OBJS_ASM) \ + ../src/liblzma/liblzma_w32res.o LIBLZMA_OBJS_STATIC_C = $(LIBLZMA_SRCS_C:.c=-static.o) LIBLZMA_OBJS_STATIC_ASM = $(LIBLZMA_SRCS_ASM:.S=-static.o) @@ -243,25 +246,25 @@ xzdec: xzdec-dynamic.exe lzmadec-dynamic.exe xzdec.exe lzmadec.exe XZDEC_SRCS = ../src/xzdec/xzdec.c -xzdec-dynamic.exe: liblzma.dll $(XZDEC_SRCS) xzdec_rc.o - $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(XZDEC_SRCS) xzdec_rc.o -o $@ liblzma.a +xzdec-dynamic.exe: liblzma.dll $(XZDEC_SRCS) ../src/xzdec/xzdec_w32res.o + $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(XZDEC_SRCS) ../src/xzdec/xzdec_w32res.o -o $@ liblzma.a $(STRIP) --strip-all $@ -lzmadec-dynamic.exe: liblzma.dll $(XZDEC_SRCS) lzmadec_rc.o - $(CC) $(ALL_CPPFLAGS) -DLZMADEC $(ALL_CFLAGS) $(XZDEC_SRCS) lzmadec_rc.o -o $@ liblzma.a +lzmadec-dynamic.exe: liblzma.dll $(XZDEC_SRCS) ../src/xzdec/lzmadec_w32res.o + $(CC) $(ALL_CPPFLAGS) -DLZMADEC $(ALL_CFLAGS) $(XZDEC_SRCS) ../src/xzdec/lzmadec_w32res.o -o $@ liblzma.a $(STRIP) --strip-all $@ -xzdec.exe: liblzma_static.lib $(XZDEC_SRCS) xzdec_rc.o - $(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(XZDEC_SRCS) xzdec_rc.o -o $@ liblzma_static.lib +xzdec.exe: liblzma_static.lib $(XZDEC_SRCS) ../src/xzdec/xzdec_w32res.o + $(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(XZDEC_SRCS) ../src/xzdec/xzdec_w32res.o -o $@ liblzma_static.lib $(STRIP) --strip-all $@ -lzmadec.exe: liblzma_static.lib $(XZDEC_SRCS) lzmadec_rc.o - $(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) -DLZMADEC $(ALL_CFLAGS) $(XZDEC_SRCS) lzmadec_rc.o -o $@ liblzma_static.lib +lzmadec.exe: liblzma_static.lib $(XZDEC_SRCS) ../src/xzdec/lzmadec_w32res.o + $(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) -DLZMADEC $(ALL_CFLAGS) $(XZDEC_SRCS) ../src/xzdec/lzmadec_w32res.o -o $@ liblzma_static.lib $(STRIP) --strip-all $@ .PHONY: xzdec-clean xzdec-clean: - -$(RM) xzdec-dynamic.exe lzmadec-dynamic.exe xzdec.exe lzmadec.exe xzdec_rc.o lzmadec_rc.o + -$(RM) xzdec-dynamic.exe lzmadec-dynamic.exe xzdec.exe lzmadec.exe ../src/xzdec/xzdec_w32res.o ../src/xzdec/lzmadec_w32res.o ########## @@ -289,17 +292,17 @@ XZ_OBJS_STATIC = $(XZ_SRCS:.c=-static.o) $(XZ_OBJS): %.o: %.c $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $< -xz-dynamic.exe: liblzma.dll $(XZ_OBJS) xz_rc.o - $(CC) $(ALL_CFLAGS) $(XZ_OBJS) xz_rc.o -o $@ liblzma.a +xz-dynamic.exe: liblzma.dll $(XZ_OBJS) ../src/xz/xz_w32res.o + $(CC) $(ALL_CFLAGS) $(XZ_OBJS) ../src/xz/xz_w32res.o -o $@ liblzma.a $(STRIP) --strip-all $@ $(XZ_OBJS_STATIC): %-static.o: %.c $(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $< -xz.exe: liblzma_static.lib $(XZ_OBJS_STATIC) xz_rc.o - $(CC) $(ALL_CFLAGS) $(XZ_OBJS_STATIC) xz_rc.o -o $@ liblzma_static.lib +xz.exe: liblzma_static.lib $(XZ_OBJS_STATIC) ../src/xz/xz_w32res.o + $(CC) $(ALL_CFLAGS) $(XZ_OBJS_STATIC) ../src/xz/xz_w32res.o -o $@ liblzma_static.lib $(STRIP) --strip-all $@ .PHONY: xz-clean xz-clean: - -$(RM) $(XZ_OBJS) $(XZ_OBJS_STATIC) xz_rc.o xz-dynamic.exe xz.exe + -$(RM) $(XZ_OBJS) $(XZ_OBJS_STATIC) ../src/xz/xz_w32res.o xz-dynamic.exe xz.exe diff --git a/windows/common.rc b/windows/common.rc deleted file mode 100644 index c7a6b13d..00000000 --- a/windows/common.rc +++ /dev/null @@ -1,46 +0,0 @@ -#include <winresrc.h> -#include "config.h" -#define LZMA_H_INTERNAL -#define LZMA_H_INTERNAL_RC -#include "lzma/version.h" - -#ifndef MY_BUILD -# define MY_BUILD 0 -#endif -#define MY_VERSION LZMA_VERSION_MAJOR,LZMA_VERSION_MINOR,LZMA_VERSION_PATCH,MY_BUILD - -#define MY_FILENAME MY_NAME MY_SUFFIX -#define MY_COMPANY "Lasse Collin and Igor Pavlov" -#define MY_COPYRIGHT "Public Domain by " MY_COMPANY -#define MY_COMMENTS "http://tukaani.org/xz/" - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -VS_VERSION_INFO VERSIONINFO - FILEVERSION MY_VERSION - PRODUCTVERSION MY_VERSION - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS 0 - FILEOS VOS_NT_WINDOWS32 - FILETYPE MY_TYPE - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", MY_COMMENTS - VALUE "CompanyName", MY_COMPANY - VALUE "FileDescription", MY_DESC - VALUE "FileVersion", LZMA_VERSION_STRING - VALUE "InternalName", MY_NAME - VALUE "LegalCopyright", MY_COPYRIGHT - VALUE "OriginalFilename", MY_FILENAME - VALUE "ProductName", PACKAGE_NAME - VALUE "ProductVersion", LZMA_VERSION_STRING - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END diff --git a/windows/liblzma.rc b/windows/liblzma.rc deleted file mode 100644 index 3d41ae18..00000000 --- a/windows/liblzma.rc +++ /dev/null @@ -1,5 +0,0 @@ -#define MY_TYPE VFT_DLL -#define MY_NAME "liblzma" -#define MY_SUFFIX ".dll" -#define MY_DESC "liblzma data compression library" -#include "common.rc" diff --git a/windows/lzmadec.rc b/windows/lzmadec.rc deleted file mode 100644 index d965d007..00000000 --- a/windows/lzmadec.rc +++ /dev/null @@ -1,5 +0,0 @@ -#define MY_TYPE VFT_APP -#define MY_NAME "lzmadec" -#define MY_SUFFIX ".exe" -#define MY_DESC "lzmadec uncompression tool for .lzma files" -#include "common.rc" diff --git a/windows/xz.rc b/windows/xz.rc deleted file mode 100644 index 5ab33c84..00000000 --- a/windows/xz.rc +++ /dev/null @@ -1,5 +0,0 @@ -#define MY_TYPE VFT_APP -#define MY_NAME "xz" -#define MY_SUFFIX ".exe" -#define MY_DESC "xz data compression tool for .xz and .lzma files" -#include "common.rc" diff --git a/windows/xzdec.rc b/windows/xzdec.rc deleted file mode 100644 index 33138b64..00000000 --- a/windows/xzdec.rc +++ /dev/null @@ -1,5 +0,0 @@ -#define MY_TYPE VFT_APP -#define MY_NAME "xzdec" -#define MY_SUFFIX ".exe" -#define MY_DESC "xzdec uncompression tool for .xz files" -#include "common.rc" |