Misc updates.

committer: mfx <mfx> 1090256162 +0000

src/Makedefs.gcc

@@ -18,8 +18,8 @@ CXXFLAGS_W =
 CXXFLAGS_M =
 CXXFLAGS_O =
 
-CFLAGS    = $(CFLAGS_W)   $(EXTRA_CFLAGS_W)   $(CFLAGS_M)   $(CFLAGS_O)   $(EXTRA_CFLAGS_O)
-CXXFLAGS  = $(CXXFLAGS_W) $(EXTRA_CXXFLAGS_W) $(CXXFLAGS_M) $(CXXFLAGS_O) $(EXTRA_CXXFLAGS_O)
+CFLAGS    = $(call __mkflags,CFLAGS_W)   $(call __mkflags,CFLAGS_M)   $(call __mkflags,CFLAGS_O)
+CXXFLAGS  = $(call __mkflags,CXXFLAGS_W) $(call __mkflags,CXXFLAGS_M) $(call __mkflags,CXXFLAGS_O)
 
 
 #

src/Makefile.bld

@@ -38,6 +38,9 @@ endif
 # util var for use in the rules - basename of the current target
 override T = $(basename $@)
 
+# expand "VAR" into "$(VAR) $(EXTRA_VAR) $(UPX_EXTRA_VAR)"
+override __mkflags = $(strip $($(1)) $(EXTRA_$(1)) $(UPX_EXTRA_$(1)))
+
 
 # /***********************************************************************
 # // compiler defaults
@@ -45,9 +48,9 @@ override T = $(basename $@)
 
 CC_SRC  = $<
 CXX_SRC = $<
-CC_COMPILE    = $(CC)  $(CCARCH)  $(DEFS) $(EXTRA_DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CFLAGS)   $(EXTRA_CFLAGS)   $(CFLAGS_OUTPUT)   -c $(CC_SRC)
-CXX_COMPILE   = $(CXX) $(CXXARCH) $(DEFS) $(EXTRA_DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(CXXFLAGS_OUTPUT) -c $(CXX_SRC)
-CXX_LINK_EXE  = $(CXXLD) $(CXXLDARCH) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LINK_EXE_OUTPUT) $^ $(LDLIBS) $(EXTRA_LDLIBS) $(LINK_EXE_LDFLAGS)
+CC_COMPILE    = $(CC)  $(CCARCH)  $(call __mkflags,DEFS) $(call __mkflags,INCLUDES) $(call __mkflags,CFLAGS)   $(CFLAGS_OUTPUT)   -c $(CC_SRC)
+CXX_COMPILE   = $(CXX) $(CXXARCH) $(call __mkflags,DEFS) $(call __mkflags,INCLUDES) $(call __mkflags,CXXFLAGS) $(CXXFLAGS_OUTPUT) -c $(CXX_SRC)
+CXX_LINK_EXE  = $(CXXLD) $(CXXLDARCH) $(call __mkflags,LDFLAGS) $(LINK_EXE_OUTPUT) $^ $(call __mkflags,LDLIBS)
 STUBEDIT_EXE  =
 STUBIFY_EXE   =
 CHMOD_EXE     =
@@ -618,7 +621,7 @@ o = .obj
 a = .lib
 e = .exe
 CC = cl -nologo
-CFLAGS = -W4
+CFLAGS = -W4 -Wall
 CXXFLAGS = $(CFLAGS) -EHac -GR
 LDFLAGS =
 LINK_EXE_OUTPUT = -Fe$@

src/conf.h

@@ -38,15 +38,7 @@
 
 #include "acc/acc.h"
 #if ((ACC_OS_WIN32 || ACC_OS_WIN64) && ACC_CC_MWERKS) && defined(__MSL__)
-# undef HAVE_UTIME_H /* this pulls in <windows.h> */
-#endif
-#include "acc/acc_incd.h"
-#include "acc/acc_ince.h"
-#include "acc/acc_lib.h"
-#if (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
-#  if defined(INVALID_HANDLE_VALUE) || defined(MAKEWORD) || defined(RT_CURSOR)
-#    error "something pulled in <windows.h>"
-#  endif
+#  undef HAVE_UTIME_H /* this pulls in <windows.h> */
 #endif
 
 
@@ -95,6 +87,12 @@
 #  pragma warning(disable: 4512)        // W4: 'class': assignment operator could not be generated
 #  pragma warning(disable: 4514)        // W4: 'function': unreferenced inline function has been removed
 #  pragma warning(disable: 4710)        // W4: 'function': function not inlined
+#  if (_MSC_VER >= 1300)
+#    pragma warning(disable: 4625)      // W4:
+#    pragma warning(disable: 4626)      // W4:
+#    pragma warning(disable: 4711)      // W4:
+#    pragma warning(disable: 4820)      // W4:
+#  endif
 #  if (_MSC_VER >= 1400)
 #    pragma warning(disable: 4996)      // W1: 'function': was declared deprecated
 #  endif
@@ -108,6 +106,16 @@
 #endif
 
 
+#include "acc/acc_incd.h"
+#include "acc/acc_ince.h"
+#include "acc/acc_lib.h"
+#if (ACC_OS_CYGWIN || ACC_OS_DOS16 || ACC_OS_DOS32 || ACC_OS_EMX || ACC_OS_OS2 || ACC_OS_OS216 || ACC_OS_WIN16 || ACC_OS_WIN32 || ACC_OS_WIN64)
+#  if defined(INVALID_HANDLE_VALUE) || defined(MAKEWORD) || defined(RT_CURSOR)
+#    error "something pulled in <windows.h>"
+#  endif
+#endif
+
+
 /*************************************************************************
 //
 **************************************************************************/

src/mygetopt.cpp

@@ -21,14 +21,13 @@
    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
+
+#undef PROGNAME
+#if 0
 #ifndef EOF
 #include <stdio.h>
 #include <string.h>
 #endif
-
-
-#undef PROGNAME
-#if 1
 #define PROGNAME(x)     (x)
 #else
 #include "conf.h"

src/packer.cpp

@@ -1030,8 +1030,8 @@ void __acc_cdecl_va Packer::addLoader(const char *s, ...)
     const char *p;
     va_list ap;
 
-    linker->addSection(s);
     va_start(ap, s);
+    linker->addSection(s);
     while((p = va_arg(ap, const char *)) != NULL)
         linker->addSection(p);
     va_end(ap);

src/ui.cpp

@@ -264,7 +264,11 @@ void UiPacker::startCallback(unsigned u_len, unsigned step,
         return;
     }
 
+#if (ACC_CC_MSC && (_MSC_VER == 1300))
+    cb.callback = &UiPacker::callback;
+#else
     cb.callback = callback;
+#endif
     cb.user = this;
 
     if (s->mode == M_CB_TERM)

src/version.h

@@ -1,4 +1,4 @@
 #define UPX_VERSION_HEX         0x019200        /* 01.92.00 */
 #define UPX_VERSION_STRING      "1.92 beta"
 #define UPX_VERSION_STRING4     "1.92"
-#define UPX_VERSION_DATE        "Jul 12th 2004"
+#define UPX_VERSION_DATE        "Jul 20th 2004"