From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Mon, 27 Feb 2012 20:43:03 +0000 (+0000)
Subject: Fix two watcom (and probably C89) issues.
X-Git-Tag: V2.14~499
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d46c3fc5a92b9160d4432b67d12ee5df656ab2e7;p=cc65

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 fd658d0fb..96cd015cb 100644
--- 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 0b019f724..7f2aff393 100644
--- 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 3daa6345e..4e3c9b0f9 100644
--- 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