revi-archive/xz-archive
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00
Code Activity

Moved the Windows resource files outside the windows directory

Browse source 
to prepare for building them with Autotools.
This commit is contained in:
Lasse Collin 2009-06-27 17:28:01 +03:00
parent 449c634674
commit 7ff0004fbc
6 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
windows/common.rc → src/common/common_w32res.rc
View file

2
windows/liblzma.rc → src/liblzma/liblzma_w32res.rc
View file

@ -2,4 +2,4 @@
#define MY_NAME "liblzma" #define MY_NAME "liblzma"
#define MY_SUFFIX ".dll" #define MY_SUFFIX ".dll"
#define MY_DESC "liblzma data compression library" #define MY_DESC "liblzma data compression library"
#include "common.rc" #include "common_w32res.rc"

2
windows/xz.rc → src/xz/xz_w32res.rc
View file

@ -2,4 +2,4 @@
#define MY_NAME "xz" #define MY_NAME "xz"
#define MY_SUFFIX ".exe" #define MY_SUFFIX ".exe"
#define MY_DESC "xz data compression tool for .xz and .lzma files" #define MY_DESC "xz data compression tool for .xz and .lzma files"
#include "common.rc" #include "common_w32res.rc"

2
windows/lzmadec.rc → src/xzdec/lzmadec_w32res.rc
View file

@ -2,4 +2,4 @@
#define MY_NAME "lzmadec" #define MY_NAME "lzmadec"
#define MY_SUFFIX ".exe" #define MY_SUFFIX ".exe"
#define MY_DESC "lzmadec uncompression tool for .lzma files" #define MY_DESC "lzmadec uncompression tool for .lzma files"
#include "common.rc" #include "common_w32res.rc"

2
windows/xzdec.rc → src/xzdec/xzdec_w32res.rc
View file

@ -2,4 +2,4 @@
#define MY_NAME "xzdec" #define MY_NAME "xzdec"
#define MY_SUFFIX ".exe" #define MY_SUFFIX ".exe"
#define MY_DESC "xzdec uncompression tool for .xz files" #define MY_DESC "xzdec uncompression tool for .xz files"
#include "common.rc" #include "common_w32res.rc"

35
windows/Makefile
View file

@ -104,7 +104,7 @@ pkg: all
$(CP) ../src/liblzma/api/lzma.h pkg/include $(CP) ../src/liblzma/api/lzma.h pkg/include
$(CP) ../src/liblzma/api/lzma/*.h pkg/include/lzma $(CP) ../src/liblzma/api/lzma/*.h pkg/include/lzma
%_rc.o: %.rc %.o: %.rc
$(WINDRES) $(ALL_CPPFLAGS) $< $@ $(WINDRES) $(ALL_CPPFLAGS) $< $@
@ -196,7 +196,10 @@ endif
LIBLZMA_OBJS_C = $(LIBLZMA_SRCS_C:.c=.o) LIBLZMA_OBJS_C = $(LIBLZMA_SRCS_C:.c=.o)
LIBLZMA_OBJS_ASM = $(LIBLZMA_SRCS_ASM:.S=.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_C = $(LIBLZMA_SRCS_C:.c=-static.o)
LIBLZMA_OBJS_STATIC_ASM = $(LIBLZMA_SRCS_ASM:.S=-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_SRCS = ../src/xzdec/xzdec.c
xzdec-dynamic.exe: liblzma.dll $(XZDEC_SRCS) xzdec_rc.o xzdec-dynamic.exe: liblzma.dll $(XZDEC_SRCS) ../src/xzdec/xzdec_w32res.o
$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(XZDEC_SRCS) xzdec_rc.o -o $@ liblzma.a $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(XZDEC_SRCS) ../src/xzdec/xzdec_w32res.o -o $@ liblzma.a
$(STRIP) --strip-all $@ $(STRIP) --strip-all $@
lzmadec-dynamic.exe: liblzma.dll $(XZDEC_SRCS) lzmadec_rc.o lzmadec-dynamic.exe: liblzma.dll $(XZDEC_SRCS) ../src/xzdec/lzmadec_w32res.o
$(CC) $(ALL_CPPFLAGS) -DLZMADEC $(ALL_CFLAGS) $(XZDEC_SRCS) lzmadec_rc.o -o $@ liblzma.a $(CC) $(ALL_CPPFLAGS) -DLZMADEC $(ALL_CFLAGS) $(XZDEC_SRCS) ../src/xzdec/lzmadec_w32res.o -o $@ liblzma.a
$(STRIP) --strip-all $@ $(STRIP) --strip-all $@
xzdec.exe: liblzma_static.lib $(XZDEC_SRCS) xzdec_rc.o xzdec.exe: liblzma_static.lib $(XZDEC_SRCS) ../src/xzdec/xzdec_w32res.o
$(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(XZDEC_SRCS) xzdec_rc.o -o $@ liblzma_static.lib $(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(XZDEC_SRCS) ../src/xzdec/xzdec_w32res.o -o $@ liblzma_static.lib
$(STRIP) --strip-all $@ $(STRIP) --strip-all $@
lzmadec.exe: liblzma_static.lib $(XZDEC_SRCS) lzmadec_rc.o lzmadec.exe: liblzma_static.lib $(XZDEC_SRCS) ../src/xzdec/lzmadec_w32res.o
$(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) -DLZMADEC $(ALL_CFLAGS) $(XZDEC_SRCS) lzmadec_rc.o -o $@ liblzma_static.lib $(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) -DLZMADEC $(ALL_CFLAGS) $(XZDEC_SRCS) ../src/xzdec/lzmadec_w32res.o -o $@ liblzma_static.lib
$(STRIP) --strip-all $@ $(STRIP) --strip-all $@
.PHONY: xzdec-clean .PHONY: xzdec-clean
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 $(XZ_OBJS): %.o: %.c
$(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $< $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $<
xz-dynamic.exe: liblzma.dll $(XZ_OBJS) xz_rc.o xz-dynamic.exe: liblzma.dll $(XZ_OBJS) ../src/xz/xz_w32res.o
$(CC) $(ALL_CFLAGS) $(XZ_OBJS) xz_rc.o -o $@ liblzma.a $(CC) $(ALL_CFLAGS) $(XZ_OBJS) ../src/xz/xz_w32res.o -o $@ liblzma.a
$(STRIP) --strip-all $@ $(STRIP) --strip-all $@
$(XZ_OBJS_STATIC): %-static.o: %.c $(XZ_OBJS_STATIC): %-static.o: %.c
$(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $< $(CC) -DLZMA_API_STATIC $(ALL_CPPFLAGS) $(ALL_CFLAGS) -c -o $@ $<
xz.exe: liblzma_static.lib $(XZ_OBJS_STATIC) xz_rc.o xz.exe: liblzma_static.lib $(XZ_OBJS_STATIC) ../src/xz/xz_w32res.o
$(CC) $(ALL_CFLAGS) $(XZ_OBJS_STATIC) xz_rc.o -o $@ liblzma_static.lib $(CC) $(ALL_CFLAGS) $(XZ_OBJS_STATIC) ../src/xz/xz_w32res.o -o $@ liblzma_static.lib
$(STRIP) --strip-all $@ $(STRIP) --strip-all $@
.PHONY: xz-clean .PHONY: xz-clean
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