diff --git a/Makefile.win32 b/Makefile.win32
index 13dd88c..21bf59a 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -6,124 +6,142 @@
 #
 # Defines :
 # -DLSB_FIRST : for little endian systems.
+# -DBUILD_TABLES: do not use const tables for 68k instructions (obsolete)
 # -DLOGERROR  : enable message logging
 # -DLOGVDP    : enable VDP debug messages
+# -DLOG_SCD   : enable SCD debug messages
+# -DLOG_CDD   : enable CDD debug messages
+# -DLOG_CDC   : enable CDC debug messages
+# -DLOG_PCM   : enable PCM debug messages
 # -DLOGSOUND  : enable AUDIO debug messages
-# -D8BPP_RENDERING  - configure for 8-bit pixels (RGB332)
-# -D15BPP_RENDERING - configure for 15-bit pixels (RGB555)
-# -D16BPP_RENDERING - configure for 16-bit pixels (RGB565)
-# -D32BPP_RENDERING - configure for 32-bit pixels (RGB888)
+# -D8BPP_RENDERING  - configure for 8-bit pixels (RGB332)
+# -D15BPP_RENDERING - configure for 15-bit pixels (RGB555)
+# -D16BPP_RENDERING - configure for 16-bit pixels (RGB565)
+# -D32BPP_RENDERING - configure for 32-bit pixels (RGB888)
 
 NAME	  = gen_sdl.exe
 
 CC        = gcc
-CFLAGS    = `sdl-config --cflags` -march=i686 -O6 -fomit-frame-pointer -Wall -Wno-strict-aliasing
+CFLAGS    = `sdl-config --cflags` -march=i686 -O6 -fomit-frame-pointer -Wall -Wno-strict-aliasing -ansi -std=c89 -pedantic-errors
+#-ansi -pedantic-errors
 #-g -ggdb -pg
 #-fomit-frame-pointer
-#LDFLAGS   = -pg
-DEFINES   = -DLSB_FIRST -DUSE_16BPP_RENDERING
-
-INCLUDES  = -Isource -Isource/z80 -Isource/m68k -Isource/sound -Isource/input_hw -Isource/cart_hw -Isource/cart_hw/svp -Isource/ntsc -Isource/win
+LDFLAGS   = 
+DEFINES   = -DLSB_FIRST -DUSE_16BPP_RENDERING -DLOGERROR -DLOG_CDC -DLOG_CDD -DLOG_SCD -DLOGVDP -DLOG_PCM
+  
+INCLUDES  = -I. -I.. -I../z80 -I../m68k -I../sound -I../input_hw -I../cart_hw -I../cd_hw -I../cart_hw/svp -I../ntsc
 LIBS	  = `sdl-config --libs` -lz -lm
 
-OBJDIR = ./build_sdl
+OBJECTS	=       obj/z80.o	
 
-OBJECTS	=       $(OBJDIR)/z80.o	
+OBJECTS	+=     	obj/m68kcpu.o \
+		obj/s68kcpu.o \
 
-OBJECTS	+=     	$(OBJDIR)/m68kcpu.o
+OBJECTS	+=     	obj/genesis.o	 \
+		obj/vdp_ctrl.o	 \
+		obj/vdp_render.o \
+		obj/system.o     \
+		obj/io_ctrl.o	 \
+		obj/mem68k.o	 \
+		obj/memz80.o	 \
+		obj/membnk.o	 \
+		obj/state.o     
 
-OBJECTS	+=     	$(OBJDIR)/genesis.o	 \
-		$(OBJDIR)/vdp_ctrl.o	 \
-		$(OBJDIR)/vdp_render.o   \
-		$(OBJDIR)/system.o       \
-		$(OBJDIR)/io_ctrl.o	 \
-		$(OBJDIR)/mem68k.o	 \
-		$(OBJDIR)/memz80.o	 \
-		$(OBJDIR)/membnk.o	 \
-		$(OBJDIR)/state.o        \
-		$(OBJDIR)/loadrom.o	
+OBJECTS	+=      obj/input.o	 \
+		obj/gamepad.o	 \
+		obj/lightgun.o	 \
+		obj/mouse.o	 \
+		obj/activator.o	 \
+		obj/xe_a1p.o	 \
+		obj/teamplayer.o \
+		obj/paddle.o	 \
+		obj/sportspad.o  \
+		obj/terebi_oekaki.o
 
-OBJECTS	+=      $(OBJDIR)/input.o	 \
-		$(OBJDIR)/gamepad.o	 \
-		$(OBJDIR)/lightgun.o	 \
-		$(OBJDIR)/mouse.o	 \
-		$(OBJDIR)/activator.o	 \
-		$(OBJDIR)/xe_a1p.o	 \
-		$(OBJDIR)/teamplayer.o   \
-		$(OBJDIR)/paddle.o	 \
-		$(OBJDIR)/sportspad.o    \
-		$(OBJDIR)/terebi_oekaki.o
 
-OBJECTS	+=      $(OBJDIR)/sound.o	\
-		$(OBJDIR)/sn76489.o     \
-		$(OBJDIR)/ym2413.o      \
-		$(OBJDIR)/ym2612.o    
+OBJECTS	+=      obj/sound.o	 \
+		obj/sn76489.o    \
+		obj/ym2413.o    \
+		obj/ym2612.o    
 
-OBJECTS	+=	$(OBJDIR)/Fir_Resampler.o
-OBJECTS	+=	$(OBJDIR)/blip.o 
-OBJECTS	+=	$(OBJDIR)/eq.o 
+OBJECTS	+=	obj/Fir_Resampler.o
+OBJECTS	+=	obj/blip.o 
 
-OBJECTS	+=      $(OBJDIR)/sram.o        \
-		$(OBJDIR)/svp.o	        \
-		$(OBJDIR)/ssp16.o       \
-		$(OBJDIR)/ggenie.o      \
-		$(OBJDIR)/areplay.o	\
-		$(OBJDIR)/gg_eeprom.o   \
-		$(OBJDIR)/md_eeprom.o   \
-		$(OBJDIR)/md_cart.o	\
-		$(OBJDIR)/sms_cart.o	
+OBJECTS	+=	obj/eq.o \
 
-OBJECTS	+=	$(OBJDIR)/sms_ntsc.o	\
-		$(OBJDIR)/md_ntsc.o
+OBJECTS	+=      obj/sram.o      \
+		obj/svp.o	\
+		obj/ssp16.o	\
+		obj/ggenie.o	\
+		obj/areplay.o	\
+		obj/gg_eeprom.o \
+		obj/md_eeprom.o \
+		obj/md_cart.o	\
+		obj/sms_cart.o	
 
-OBJECTS	+=	$(OBJDIR)/main.o	\
-		$(OBJDIR)/config.o	\
-		$(OBJDIR)/error.o	\
-		$(OBJDIR)/unzip.o       \
-		$(OBJDIR)/fileio.o	
+OBJECTS	+=      obj/scd.o	\
+		obj/cdd.o	\
+		obj/cdc.o	\
+		obj/gfx.o	\
+		obj/pcm.o	\
+		obj/cd_cart.o
 
-OBJECTS	+=	$(OBJDIR)/icon.o
+OBJECTS	+=	obj/main.o	\
+		obj/config.o	\
+		obj/error.o	\
+		obj/unzip.o     \
+		obj/fileio.o	\
+		obj/loadrom.o	
+
+OBJECTS	+=	obj/sms_ntsc.o	\
+		obj/md_ntsc.o
+
+OBJECTS	+=	obj/icon.o
 
 all: $(NAME)
 
-$(NAME): $(OBJDIR) $(OBJECTS)
-		$(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+$(NAME): $(OBJECTS)
+	$(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@ -Wl,-Map,genplus.map
 
-$(OBJDIR) :
-		@[ -d $@ ] || mkdir -p $@
-		
-$(OBJDIR)/%.o : 	source/%.c source/%.h
+obj/%.o : 	../%.c ../%.h
 		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
-	        	        
-$(OBJDIR)/%.o :	source/sound/%.c source/sound/%.h	        
+	        
+obj/%.o :	../asm/%.s
+		$(AS) $< -o $@
+	        
+obj/%.o :	../sound/%.c ../sound/%.h	        
+		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
+obj/%.o :	../sound/%.c      
 		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
 
-$(OBJDIR)/%.o :	source/input_hw/%.c source/input_hw/%.h	        
+obj/%.o :	../input_hw/%.c ../input_hw/%.h	        
 		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
 
-$(OBJDIR)/%.o :	source/cart_hw/%.c source/cart_hw/%.h	        
+obj/%.o :	../cart_hw/%.c ../cart_hw/%.h	        
 		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
 
-$(OBJDIR)/%.o :	source/cart_hw/svp/%.c      
+obj/%.o :	../cart_hw/svp/%.c      
+		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
+obj/%.o :	../cart_hw/svp/%.c ../cart_hw/svp/%.h	        
 		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
 
-$(OBJDIR)/%.o :	source/cart_hw/svp/%.c source/cart_hw/svp/%.h	        
+obj/%.o :	../cd_hw/%.c      
 		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
 
-$(OBJDIR)/%.o :	source/z80/%.c source/z80/%.h	        
+obj/%.o :	../z80/%.c ../z80/%.h	        
 		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
 
-$(OBJDIR)/%.o :	source/m68k/%.c source/m68k/%.h	        
+obj/%.o :	../m68k/%.c   
 		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
 
-$(OBJDIR)/%.o :	source/ntsc/%.c source/ntsc/%.h	        
+obj/%.o :	./%.c ./%.h	        
 		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
 
-$(OBJDIR)/%.o :	source/win/%.c source/win/%.h	        
+obj/%.o :	../ntsc/%.c ../ntsc/%.h	        
 		$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< -o $@
-
-$(OBJDIR)/icon.o :	
-		windres source/win/icon.rc $@
+	        
+obj/icon.o :	
+		windres icon.rc $@
 
 pack	:
 		strip $(NAME)