- updated the makefiles and code to allow compliation with MinGW once again (some of patch #875485 by perditionc)
- fixed errors and warnings given by gcc git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3513 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik
parent
2b3da85bae
commit
f4a1f17299
43 changed files with 323 additions and 252 deletions
|
|
@ -1,74 +1,83 @@
|
|||
#
|
||||
# This makefile for mingw32 by Nels. Thanks, Nels
|
||||
#
|
||||
#
|
||||
# -- Subdirs --
|
||||
SUBDIRS = exehead
|
||||
|
||||
# -- Objects and source files --
|
||||
SRCS = crc32.c build.cpp exedata.cpp makenssi.cpp script.cpp tokens.cpp util.cpp ResourceEditor.cpp DialogTemplate.cpp ./zlib/deflate.c ./zlib/trees.c ./bzip2/blocksort.c ./bzip2/bzlib.c ./bzip2/compress.c ./bzip2/huffman.c
|
||||
OBJS = build.o exedata.o makenssi.o script.o tokens.o util.o script1.res crc32.o ResourceEditor.o DialogTemplate.o deflate.o trees.o blocksort.o bzlib.o compress.o huffman.o
|
||||
LIBS = -lgdi32 -lversion
|
||||
SRCS = zlib/deflate.c zlib/trees.c bzip2/blocksort.c bzip2/bzlib.c bzip2/compress.c bzip2/huffman.c 7zip/7zGuids.cpp 7zip/Common/CRC.cpp 7zip/7zip/Compress/LZ/LZInWindow.cpp 7zip/7zip/Compress/LZMA/LZMAEncoder.cpp 7zip/7zip/Compress/LZMA/LZMALen.cpp 7zip/7zip/Compress/LZMA/LZMALiteral.cpp 7zip/7zip/Common/OutBuffer.cpp 7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp build.cpp crc32.c DialogTemplate.cpp exedata.cpp lang.cpp makenssi.cpp Plugins.cpp ResourceEditor.cpp ResourceVersionInfo.cpp script.cpp tokens.cpp util.cpp
|
||||
OBJS = 7zGuids.o blocksort.o build.o bzlib.o compress.o CRC.o crc32.o deflate.o DialogTemplate.o exedata.o huffman.o lang.o LZInWindow.o LZMAEncoder.o LZMALen.o LZMALiteral.o makenssi.o OutBuffer.o Plugins.o RangeCoderBit.o ResourceEditor.o ResourceVersionInfo.o script.o tokens.o trees.o util.o
|
||||
LIBS = -lgdi32 -lversion -lstdc++
|
||||
|
||||
# -- Required .h files --
|
||||
BASEINC = Platform.h exehead/config.h
|
||||
|
||||
# -- Programs --
|
||||
MAKE = make
|
||||
CC = gcc
|
||||
RC = windres
|
||||
RM = del
|
||||
RM = rm
|
||||
|
||||
# -- Compilers and linker flags --
|
||||
DEFINES = -DWIN32 -D_WINDOWS_
|
||||
CFLAGS = -O2 $(DEFINES)
|
||||
CPPFLAGS = -O2 -fvtable-thunks $(DEFINES)
|
||||
CFLAGS = -Wall -O2 $(DEFINES)
|
||||
CPPFLAGS = -Wall -O2 $(DEFINES)
|
||||
LFLAGS = -s
|
||||
RCFLAGS = --input-format rc --output-format coff
|
||||
|
||||
all : subdirs makensis
|
||||
all : exehead_zlib exehead_bzip2 exehead_lzma exehead_resources makensis
|
||||
|
||||
subdirs: $(SUBDIRS)
|
||||
|
||||
$(SUBDIRS)::
|
||||
$(MAKE) -C $@ all
|
||||
exehead_zlib exehead_bzip2 exehead_lzma exehead_resources :
|
||||
$(MAKE) -C exehead $@
|
||||
|
||||
makensis : $(OBJS)
|
||||
$(CC) $(CFLAGS) $(CPPFLAGS) $(LFLAGS) -o makensis.exe $(OBJS) $(LIBS)
|
||||
$(CC) $(CFLAGS) $(CPPFLAGS) $(LFLAGS) -o ../makensis.exe $(OBJS) $(LIBS)
|
||||
|
||||
# -- Dependencies --
|
||||
build.o : build.cpp ./zlib/zlib.h ./exehead/config.h ./exehead/fileform.h ./exehead/resource.h exedata.h build.h util.h strlist.h lineparse.h ResourceEditor.h Makefile
|
||||
exedata.o : exedata.cpp exedata.h ./exehead/Release/bitmap1.h ./exehead/Release/bitmap2.h ./exehead/Release/icon.h ./exehead/Release/unicon.h ./exehead/Release/exehead.h Makefile
|
||||
makenssi.o : makenssi.cpp build.h util.h exedata.h strlist.h lineparse.h ./exehead/fileform.h ./exehead/config.h Makefile
|
||||
script.o : script.cpp tokens.h build.h util.h exedata.h strlist.h lineparse.h ResourceEditor.h DialogTemplate.h ./exehead/resource.h ./exehead/fileform.h ./exehead/config.h Makefile
|
||||
build.o : build.cpp ./zlib/zlib.h $(BASEINC) ./exehead/fileform.h ./exehead/resource.h exedata.h build.h util.h strlist.h lineparse.h ResourceEditor.h Makefile
|
||||
exedata.o : exedata.cpp exedata.h ./exehead/Release-zlib/bitmap1.h ./exehead/Release-zlib/icon.h ./exehead/Release-zlib/unicon.h ./exehead/Release-zlib/exehead_zlib.h Makefile
|
||||
makenssi.o : makenssi.cpp build.h util.h exedata.h strlist.h lineparse.h ./exehead/fileform.h $(BASEINC) Makefile
|
||||
script.o : script.cpp tokens.h build.h util.h exedata.h strlist.h lineparse.h ResourceEditor.h DialogTemplate.h ./exehead/resource.h ./exehead/fileform.h $(BASEINC) Makefile
|
||||
tokens.o : tokens.cpp build.h tokens.h Makefile
|
||||
util.o : util.cpp ./exehead/fileform.h util.h strlist.h ResourceEditor.h Makefile
|
||||
crc32.o : crc32.c ./exehead/config.h Makefile
|
||||
crc32.o : crc32.c $(BASEINC) Makefile
|
||||
ResourceEditor.o : ResourceEditor.cpp
|
||||
DialogTemplate.o : DialogTemplate.cpp
|
||||
|
||||
# -- Special command line for the resource file --
|
||||
script1.res : script1.rc resource.h Makefile
|
||||
$(RC) $(RCFLAGS) -o script1.res -i script1.rc
|
||||
|
||||
# -- Special command lines for zlib --
|
||||
deflate.o : ./zlib/deflate.c ./zlib/deflate.h ./zlib/zutil.h ./zlib/zlib.h ./zlib/zconf.h Makefile ./exehead/config.h
|
||||
$(CC) $(CFLAGS) -c ./zlib/deflate.c -o deflate.o
|
||||
|
||||
trees.o : ./zlib/trees.c ./zlib/deflate.h ./zlib/zutil.h ./zlib/zlib.h ./zlib/zconf.h Makefile ./exehead/config.h
|
||||
$(CC) $(CFLAGS) -c ./zlib/trees.c -o trees.o
|
||||
deflate.o : zlib/deflate.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
trees.o : zlib/trees.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
|
||||
# -- Special command lines for bzip2 --
|
||||
blocksort.o : ./bzip2/blocksort.c ./bzip2/bzlib.h ./bzip2/bzlib_private.h ./exehead/config.h
|
||||
$(CC) $(CFLAGS) -c ./bzip2/blocksort.c -o blocksort.o
|
||||
bzlib.o : ./bzip2/bzlib.c ./bzip2/bzlib.h ./bzip2/bzlib_private.h ./exehead/config.h
|
||||
$(CC) $(CFLAGS) -c ./bzip2/bzlib.c -o bzlib.o
|
||||
compress.o : ./bzip2/compress.c ./bzip2/bzlib.h ./bzip2/bzlib_private.h ./exehead/config.h
|
||||
$(CC) $(CFLAGS) -c ./bzip2/compress.c -o compress.o
|
||||
huffman.o : ./bzip2/huffman.c ./bzip2/bzlib.h ./bzip2/bzlib_private.h ./exehead/config.h
|
||||
$(CC) $(CFLAGS) -c ./bzip2/huffman.c -o huffman.o
|
||||
blocksort.o : bzip2/blocksort.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
bzlib.o : bzip2/bzlib.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
compress.o : bzip2/compress.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
huffman.o : bzip2/huffman.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
|
||||
# -- Special command lines for lzma --
|
||||
7zGuids.o : 7zip/7zGuids.cpp
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
CRC.o : 7zip/Common/CRC.cpp
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
LZInWindow.o : 7zip/7zip/Compress/LZ/LZInWindow.cpp
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
LZMAEncoder.o : 7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
LZMALen.o : 7zip/7zip/Compress/LZMA/LZMALen.cpp
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
LZMALiteral.o : 7zip/7zip/Compress/LZMA/LZMALiteral.cpp
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
OutBuffer.o : 7zip/7zip/Common/OutBuffer.cpp
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
RangeCoderBit.o : 7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
|
||||
# -- Clean script --
|
||||
clean ::
|
||||
$(MAKE) -C exehead clean
|
||||
$(RM) *.o
|
||||
$(RM) script1.res
|
||||
$(RM) makensis.exe
|
||||
$(RM) ../makensis.exe
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue