Updates.

committer: mfx <mfx> 1071922490 +0000

src/Makedefs.dep

@@ -3,44 +3,38 @@ DEPS_DONE := 1
 
 
 # /***********************************************************************
-# // gcc automated dependencies
+# // automated dependencies
 # ************************************************************************/
 
 ifeq ($(DEPMODE),gcc)
+EXTRA_CFLAGS   += -Wp,-MMD,.deps/$(*F).d
+EXTRA_CXXFLAGS += -Wp,-MMD,.deps/$(*F).d
+HAVE_DEPS := 1
+endif
 
-EXTRA_CFLAGS   += -Wp,-MMD,.deps/$(*F).pp
+ifeq ($(DEPMODE),linux-intelc)
-EXTRA_CXXFLAGS += -Wp,-MMD,.deps/$(*F).pp
+EXTRA_CFLAGS   += -MMD -MF.deps/$(*F).d
+EXTRA_CXXFLAGS += -MMD -MF.deps/$(*F).d
+HAVE_DEPS := 1
+endif
 
+ifeq ($(DEPMODE),linux-pgi)
+## NOTE: -MMD does not work...
+EXTRA_CFLAGS   += -MD.deps/$(*F).d
+EXTRA_CXXFLAGS += -MD.deps/$(*F).d
+HAVE_DEPS := 1
+endif
+
+
+ifeq ($(HAVE_DEPS),1)
 ifeq ($(strip $(wildcard .deps)),)
   DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 else
-  DEP_FILES := $(wildcard .deps/*.pp)
+  DEPS_FILES := $(wildcard .deps/*.d)
-  ifneq ($(strip $(DEP_FILES)),)
+  ifneq ($(strip $(DEPS_FILES)),)
-    include $(DEP_FILES)
+    include $(DEPS_FILES)
   endif
 endif
-
-endif
-
-
-# /***********************************************************************
-# // Intel C automated dependencies
-# ************************************************************************/
-
-ifeq ($(DEPMODE),intelc_linux)
-
-EXTRA_CFLAGS   += -MMD -MF.deps/$(*F).pp
-EXTRA_CXXFLAGS += -MMD -MF.deps/$(*F).pp
-
-ifeq ($(strip $(wildcard .deps)),)
-  DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-else
-  DEP_FILES := $(wildcard .deps/*.pp)
-  ifneq ($(strip $(DEP_FILES)),)
-    include $(DEP_FILES)
-  endif
-endif
-
 endif
 
 

src/Makefile

@@ -26,7 +26,7 @@
 
 ifeq ($(strip $(UCLDIR)),)
 # change this to reflect where the UCL library is
-UCLDIR = $(HOME)/local/src/ucl-1.01
+UCLDIR = $(HOME)/local/src/ucl-1.02
 endif
 
 ## you can set the default target here

src/Makefile.bld

@@ -163,7 +163,7 @@ endif	# linux
 ###
 
 ifeq ($(target),linux-bc57)
-##DEPMODE := XXX_linux	## FIXME
+##DEPMODE := linux-XXX	## FIXME
 CC = bc++ -q -3
 CFLAGS = -w '-w!'
 CFLAGS_OUTPUT = -o$@
@@ -188,7 +188,7 @@ endif
 ###
 
 ifeq ($(target),linux-intelc)
-DEPMODE := intelc_linux
+DEPMODE := linux-intelc
 CC = icc
 CXX = icpc
 CCARCH += -march=i386 -mcpu=i686 -nolib_inline
@@ -214,7 +214,7 @@ endif
 ###
 
 ifeq ($(target),linux-pgi)
-##DEPMODE := XXX_linux	## FIXME
+DEPMODE := linux-pgi
 CC = pgcc
 CXX = pgCC
 CCARCH += -tp=p6

src/conf.h

@@ -135,7 +135,7 @@
 #if defined(WITH_UCL)
 #  include <ucl/uclconf.h>
 #  include <ucl/ucl.h>
-#  if !defined(UCL_VERSION) || (UCL_VERSION < 0x010100L)
+#  if !defined(UCL_VERSION) || (UCL_VERSION < 0x010200L)
 #    error "please upgrade your UCL installation"
 #  endif
 #  if !defined(UPX_UINT_MAX)

src/p_ps1.cpp

@@ -77,6 +77,7 @@ PackPs1::PackPs1(InputFile *f) :
     COMPILE_TIME_ASSERT(PS_HDR_SIZE > sizeof(ps1_exe_t));
     COMPILE_TIME_ASSERT(SZ_IH_BKUP == 40);
 #if defined(WITH_NRV)
+    COMPILE_TIME_ASSERT(sizeof(nrv_loader) == 1570);
     COMPILE_TIME_ASSERT(NRV_LOADER_CRC32 == 0xd78b1eb4);
 #endif