Fix two watcom (and probably C89) issues.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5564 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/sp65/bitmap.h b/src/sp65/bitmap.h
index fd658d0fbd6acd11bee2638f0dbfef7a82c978d3..96cd015cb2fd77abd1d0f7bd9efa8ca0398c5488 100644 (file)
--- a/src/sp65/bitmap.h
+++ b/src/sp65/bitmap.h
@@ -57,7 +57,6 @@
 #define BM_MAX_SIZE     4194304UL
 
 /* Bitmap type */
-typedef enum BitmapType BitmapType;
 enum BitmapType {
     bmUnknown,
     bmMonochrome,
@@ -65,6 +64,7 @@ enum BitmapType {
     bmRGB,
     bmRGBA
 };
+typedef enum BitmapType BitmapType;
 
 /* Bitmap structure */
 typedef struct Bitmap Bitmap;

diff --git a/src/sp65/input.h b/src/sp65/input.h
index 0b019f72481ec4303cfa8a2b0939bc784d2a39bd..7f2aff393c3daa8453f2264e26c63b27f4bd3a12 100644 (file)
--- a/src/sp65/input.h
+++ b/src/sp65/input.h
@@ -49,13 +49,13 @@
 
 
 
-typedef enum InputFormat InputFormat;
 enum InputFormat {
     ifAuto      = -1,           /* Auto detect */
     ifPCX,                      /* PCX */
 
     ifCount                     /* Number of actual input formats w/o ifAuto*/
 };
+typedef enum InputFormat InputFormat;                
 
 
 

diff --git a/src/sp65/make/watcom.mak b/src/sp65/make/watcom.mak
index 3daa6345e694cf06bac44bd0931b5d4e113b8aa8..4e3c9b0f9e3d63b867307c0e6c66c72fa8f7116e 100644 (file)
--- a/src/sp65/make/watcom.mak
+++ b/src/sp65/make/watcom.mak
@@ -60,8 +60,16 @@ endif
 # ------------------------------------------------------------------------------
 # All OBJ files
 
-OBJS =  error.obj      \
-       main.obj
+OBJS =  asm.obj         \
+        bin.obj         \
+        bitmap.obj      \
+        color.obj       \
+        error.obj      \
+        fileio.obj      \
+        input.obj       \
+       main.obj        \
+        palette.obj     \
+        pcx.obj
 
 LIBS = ../common/common.lib