Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Some fixes for latest gcc 3.4 snapshot.

Browse Source 
committer: mfx <mfx> 1059510876 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2003-07-29 20:34:36 +00:00
parent 2163231401
commit 69d9aa6c69
5 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.bld
+9 -6
View File
@@ -198,7 +198,7 @@ LINK_EXE_OUTPUT = -e$@
ifeq ($(WITH_ZLIB),1)
LDLIBS += -lz
endif
# warning: do _not_ use option `-d' --> incorrect string merging will happen
# warning: do not use option `-d' --> incorrect string merging will happen
ifeq ($(DEBUG),1)
CFLAGS += -Od -dc
else
@@ -279,7 +279,7 @@ endif # djgpp2
###
### win32 - cygwin / mingw32
### win32 - cygwin / mingw32 / rsxnt
###
ifeq ($(target),cygwin)
@@ -331,7 +331,10 @@ o = .obj
a = .lib
e = .exe
CC = bcc32 -3
INCLUDES += -I$(srcdir)/acc -I$(srcdir)/filter
INCLUDES += -I$(srcdir)/acc
ifneq ($(strip $(wildcard $(srcdir)/filter)),)
INCLUDES += -I$(srcdir)/filter
endif
CFLAGS = -w -w-inl -g1
CFLAGS_OUTPUT = -o$@
LDFLAGS = -ls
@@ -416,7 +419,7 @@ ifeq ($(DEBUG),1)
CFLAGS += -Od -ZI
LINK_EXE_LDFLAGS += /debug
else
CFLAGS += -O1 -GF
CFLAGS += -O1 -GF -Gy
LINK_EXE_LDFLAGS += /release
endif
RESOURCES := $(subst .rc,.res,$(notdir $(wildcard $(srcdir)/*.rc)))
@@ -475,7 +478,7 @@ LIB := $(DOS_LIBDIRS);$(LIB)
endif
export LIB
ifeq (1,2)
ifeq (1,1)
# statically link libc.lib
CC += -ML
LDLIBS = $(DOS_LDLIBS:.lib=_ml.lib) setargv.obj
@@ -488,7 +491,7 @@ ifeq ($(DEBUG),1)
CFLAGS += -Od -ZI
LINK_EXE_LDFLAGS += /debug
else
CFLAGS += -O1 -GF
CFLAGS += -O1 -GF -Gy
LINK_EXE_LDFLAGS += /release
##LINK_EXE_LDFLAGS += /opt:nowin98
endif