Reorganised tree to work-around windows CreateProcess() 32Kb limit. Reenabled depend in MinGW makefile, since it shouldn't cause any more issues.

makefile.burn_rules

@@ -1,9 +1,8 @@
-alldir	= 	burn burn/devices burn/sound burn/drivers burn/drivers/capcom burn/drivers/cave burn/drivers/cps3 \
-			burn/drivers/dataeast burn/drivers/galaxian burn/drivers/irem burn/drivers/konami burn/drivers/megadrive \
-			burn/drivers/misc_post90s burn/drivers/misc_pre90s burn/drivers/neogeo burn/drivers/pgm burn/drivers/psikyo \
-			burn/drivers/sega burn/drivers/snes burn/drivers/taito burn/drivers/toaplan \
+alldir	= 	burn burn/devices burn/snd burn/drv burn/drv/capcom burn/drv/cave burn/drv/cps3 burn/drv/dataeast \
+			burn/drv/galaxian burn/drv/irem burn/drv/konami burn/drv/megadrive burn/drv/pst90s burn/drv/pre90s \
+			burn/drv/neogeo burn/drv/pgm burn/drv/psikyo burn/drv/sega burn/drv/snes burn/drv/taito burn/drv/toaplan \
 			cpu cpu/a68k cpu/arm cpu/arm7 cpu/h6280 cpu/hd6309 cpu/i8039 cpu/konami cpu/m68k cpu/m6502 cpu/m6800 cpu/m6805 \
-			cpu/m6809 cpu/nec cpu/s2650 cpu/sh2 cpu/z80 
+			cpu/m6809 cpu/nec cpu/s2650 cpu/sh2 cpu/z80
 
 drvobj	= 	d_dodonpachi.o d_donpachi.o d_esprade.o d_feversos.o d_gaia.o d_guwange.o d_hotdogst.o d_korokoro.o d_mazinger.o \
 			d_metmqstr.o d_pwrinst2.o d_sailormn.o d_tjumpman.o d_uopoko.o \
@@ -113,7 +112,7 @@ depobj	:= 	$(drvobj) \
 			\
 			megadrive.o \
 			\
-			snes_65816.o snes_io.o snes_main.o snes_mem.o snes_ppu.o snes_spc700.o			
+			snes_65816.o snes_io.o snes_main.o snes_mem.o snes_ppu.o snes_spc700.o
 			
 ifdef	DEBUG
 depobj += m68kdasm.o

makefile.burner_win32_rules

@@ -1,6 +1,6 @@
-alldir	+= 	burner burner/platform/win32 depend/kaillera/client depend/libs/libpng depend/libs/zlib interface interface/video \
-			interface/video/scalers interface/video/win32 interface/audio interface/audio/win32 interface/input \
-			interface/input/win32 interface/cd interface/cd/win32 interface/perfcount interface/perfcount/win32 depend/generated
+alldir	+= 	burner burner/win32 dep/kaillera/client dep/libs/libpng dep/libs/zlib intf intf/video intf/video/scalers \
+			intf/video/win32 intf/audio intf/audio/win32 intf/input intf/input/win32 intf/cd intf/cd/win32 intf/perfcount \
+			intf/perfcount/win32 dep/generated
 
 depobj	+= 	about.o bzip.o cona.o debugger.o drv.o dwmapi_core.o dynhuff.o fba_kaillera.o image_win32.o inpc.o inpcheat.o inpd.o \
 			inpdipsw.o inps.o ips_manager.o localise.o localise_gamelist.o main.o mdi.o media.o memcard.o menu.o misc_win32.o \

makefile.mingw

@@ -11,7 +11,7 @@ unexport
 #
 
 # Check for changes in header files
-# DEPEND = 1
+DEPEND = 1
 
 
 
@@ -21,6 +21,7 @@ unexport
 
 # Specify the name of the executable file, without ".exe"
 NAME = fba
+COMPILENAME = 3
 
 ifdef BUILD_X64_EXE
 ifdef BUILD_A68K
@@ -42,19 +43,24 @@ else
 endif
 
 ifndef BUILD_X86_ASM
-	NAME := $(NAME)n
+	NAME := $(NAME)x
+	COMPILENAME := $(COMPILENAME)x
 endif
 ifdef BUILD_X64_EXE
 	NAME = fba64
+	COMPILENAME = 6
 endif
 ifdef	DEBUG
 	NAME := $(NAME)d
+	COMPILENAME := $(COMPILENAME)d
 endif
 ifdef	SYMBOL
 	NAME := $(NAME)s
+	COMPILENAME := $(COMPILENAME)s
 endif
 ifndef UNICODE
 	NAME := $(NAME)a
+	COMPILENAME := $(COMPILENAME)a
 endif
 
 ifeq	($(CPUTYPE),i686)
@@ -70,13 +76,13 @@ endif
 #
 
 ifdef GCC345
-objdir	= obj/GNU345_WIN32/$(NAME)/
+objdir	= obj/34/$(COMPILENAME)/
 endif
 ifdef GCC452
-objdir	= obj/GNU452_WIN32/$(NAME)/
+objdir	= obj/45/$(COMPILENAME)/
 endif
 ifdef GCC461
-objdir	= obj/GNU461_WIN32/$(NAME)/
+objdir	= obj/46/$(COMPILENAME)/
 endif
 
 srcdir	= src/
@@ -85,21 +91,20 @@ include makefile.burn_rules
 include makefile.burner_win32_rules
 
 ifdef GCC345
-incdir	= $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)depend/generated -I$(srcdir)depend/mingw/include -I- -I$(srcdir)depend/mingw/include/directx9 -I$(srcdir)depend/mingw/include/xaudio2 
+incdir	= $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)dep/generated -I$(srcdir)dep/mingw/include -I- -I$(srcdir)dep/mingw/include/directx9 -I$(srcdir)dep/mingw/include/xaudio2 
 endif
 ifdef GCC452
-incdir	= $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)depend/generated -I$(srcdir)depend/mingw/include -I$(srcdir)depend/mingw/include/directx9 -I$(srcdir)depend/mingw/include/xaudio2
+incdir	= $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)dep/generated -I$(srcdir)dep/mingw/include -I$(srcdir)dep/mingw/include/directx9 -I$(srcdir)dep/mingw/include/xaudio2
 endif
 ifdef GCC461
-incdir	= $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)depend/generated -I$(srcdir)depend/mingw/include -I$(srcdir)depend/mingw/include/directx9 -I$(srcdir)depend/mingw/include/xaudio2
+incdir	= $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)dep/generated -I$(srcdir)dep/mingw/include -I$(srcdir)dep/mingw/include/directx9 -I$(srcdir)dep/mingw/include/xaudio2
 endif
 
 ifdef UNICODE
 # lib	= -lunicows
 endif
 
-lib	+=	-luser32 -lgdi32 -lcomdlg32 -lcomctl32 -lshell32 -lwinmm -lshlwapi \
-		-ladvapi32 -lsetupapi -lole32 -luuid
+lib	+=	-luser32 -lgdi32 -lcomdlg32 -lcomctl32 -lshell32 -lwinmm -lshlwapi -ladvapi32 -lsetupapi -lole32 -luuid
 		
 
 depobj	+=	resource.o \
@@ -110,17 +115,17 @@ ifdef	BUILD_A68K
 a68k.o	= $(objdir)cpu/a68k/a68k.o
 endif
 
-app_gnuc.rc = $(srcdir)depend/generated/app_gnuc.rc
-license.rtf = $(srcdir)depend/generated/license.rtf
-driverlist.h = $(srcdir)depend/generated/driverlist.h
-ctv.h	= $(srcdir)depend/generated/ctv.h
-toa_gp9001_func.h = $(srcdir)depend/generated/toa_gp9001_func.h
-neo_sprite_func.h = $(srcdir)depend/generated/neo_sprite_func.h
-cave_tile_func.h = $(srcdir)depend/generated/cave_tile_func.h
-cave_sprite_func.h = $(srcdir)depend/generated/cave_sprite_func.h
-psikyo_tile_func.h = $(srcdir)depend/generated/psikyo_tile_func.h
-pgm_sprite.h = $(srcdir)depend/generated/pgm_sprite.h
-build_details.h = $(srcdir)depend/generated/build_details.h
+app_gnuc.rc = $(srcdir)dep/generated/app_gnuc.rc
+license.rtf = $(srcdir)dep/generated/license.rtf
+driverlist.h = $(srcdir)dep/generated/driverlist.h
+ctv.h	= $(srcdir)dep/generated/ctv.h
+toa_gp9001_func.h = $(srcdir)dep/generated/toa_gp9001_func.h
+neo_sprite_func.h = $(srcdir)dep/generated/neo_sprite_func.h
+cave_tile_func.h = $(srcdir)dep/generated/cave_tile_func.h
+cave_sprite_func.h = $(srcdir)dep/generated/cave_sprite_func.h
+psikyo_tile_func.h = $(srcdir)dep/generated/psikyo_tile_func.h
+pgm_sprite.h = $(srcdir)dep/generated/pgm_sprite.h
+build_details.h = $(srcdir)dep/generated/build_details.h
 
 allobj	= $(objdir)cpu/m68k/m68kcpu.o $(objdir)cpu/m68k/m68kopnz.o $(objdir)cpu/m68k/m68kopdm.o $(objdir)cpu/m68k/m68kopac.o $(objdir)cpu/m68k/m68kops.o \
 	  $(foreach file,$(autobj:.o=.c), \
@@ -400,9 +405,9 @@ endif
 
 burn.o burn.d:	driverlist.h
 
-$(driverlist.h): $(drvobj) $(srcdir)depend/scripts/gamelist.pl
+$(driverlist.h): $(drvobj) $(srcdir)dep/scripts/gamelist.pl
 ifdef	PERL
-	@$(srcdir)depend/scripts/gamelist.pl -o $@ -l gamelist.txt \
+	@$(srcdir)dep/scripts/gamelist.pl -o $@ -l gamelist.txt \
 		$(filter %.cpp,$(foreach file,$(drvobj:.o=.cpp),$(foreach dir,$(alldir), \
 		$(firstword $(wildcard $(srcdir)$(dir)/$(file))))))
 else
@@ -431,10 +436,10 @@ endif
 
 resource.o resource.d:	$(app_gnuc.rc) string.rc version.rc version.h $(build_details.h)
 
-$(license.rtf): $(srcdir)license.txt $(srcdir)depend/scripts/license2rtf.pl
+$(license.rtf): $(srcdir)license.txt $(srcdir)dep/scripts/license2rtf.pl
 
 ifdef	PERL
-	@$(srcdir)depend/scripts/license2rtf.pl $< -o $(srcdir)depend/generated/$(@F:.rc=.rtf)
+	@$(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf)
 else
 ifeq ($(MAKELEVEL),2)
 	@echo
@@ -444,10 +449,10 @@ ifeq ($(MAKELEVEL),2)
 endif
 endif
 
-$(app_gnuc.rc): app.rc $(license.rc) $(license.rtf) $(srcdir)depend/scripts/fixrc.pl $(srcdir)burner/resource/fba.ico $(srcdir)burner/resource/about.bmp $(srcdir)burner/resource/splash.bmp $(srcdir)burner/resource/misc.bmp
+$(app_gnuc.rc): app.rc $(license.rc) $(license.rtf) $(srcdir)dep/scripts/fixrc.pl $(srcdir)burner/resource/fba.ico $(srcdir)burner/resource/about.bmp $(srcdir)burner/resource/splash.bmp $(srcdir)burner/resource/misc.bmp
 
 ifdef	PERL
-	@$(srcdir)depend/scripts/fixrc.pl $< -o $@
+	@$(srcdir)dep/scripts/fixrc.pl $< -o $@
 else
 ifeq ($(MAKELEVEL),2)
 	@echo
@@ -463,9 +468,9 @@ endif
 
 about.o about.d: $(build_details.h)
 
-$(build_details.h):	$(srcdir)depend/scripts/build_details.cpp
-	@$(CXX) -mconsole $(CXXFLAGS) $(LDFLAGS) $< -o $(objdir)depend/generated/build_details.exe
-	@$(objdir)depend/generated/build_details.exe >$@
+$(build_details.h):	$(srcdir)dep/scripts/build_details.cpp
+	@$(CXX) -mconsole $(CXXFLAGS) $(LDFLAGS) $< -o $(objdir)dep/generated/build_details.exe
+	@$(objdir)dep/generated/build_details.exe >$@
 
 #
 #	Compile 68000 cores
@@ -486,28 +491,28 @@ endif
 
 # Musashi
 
-$(objdir)cpu/m68k/m68kcpu.o: $(srcdir)cpu/m68k/m68kcpu.c $(objdir)depend/generated/m68kops.h $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
+$(objdir)cpu/m68k/m68kcpu.o: $(srcdir)cpu/m68k/m68kcpu.c $(objdir)dep/generated/m68kops.h $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo Compiling Musashi MC680x0 core \(m68kcpu.c\)...
 	@$(CC) $(CFLAGS) -c $(srcdir)cpu/m68k/m68kcpu.c -o $(objdir)cpu/m68k/m68kcpu.o
 
-$(objdir)cpu/m68k/m68kops.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)depend/generated/m68kops.h $(objdir)depend/generated/m68kops.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
+$(objdir)cpu/m68k/m68kops.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kops.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo Compiling Musashi MC680x0 core \(m68kops.c\)...
-	@$(CC) $(CFLAGS) -c $(objdir)depend/generated/m68kops.c -o $(objdir)cpu/m68k/m68kops.o
+	@$(CC) $(CFLAGS) -c $(objdir)dep/generated/m68kops.c -o $(objdir)cpu/m68k/m68kops.o
 
-$(objdir)cpu/m68k/m68kopac.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)depend/generated/m68kops.h $(objdir)depend/generated/m68kopac.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
+$(objdir)cpu/m68k/m68kopac.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kopac.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo Compiling Musashi MC680x0 core \(m68kopac.c\)...
-	@$(CC) $(CFLAGS) -c $(objdir)depend/generated/m68kopac.c -o $(objdir)cpu/m68k/m68kopac.o
+	@$(CC) $(CFLAGS) -c $(objdir)dep/generated/m68kopac.c -o $(objdir)cpu/m68k/m68kopac.o
 
-$(objdir)cpu/m68k/m68kopdm.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)depend/generated/m68kops.h $(objdir)depend/generated/m68kopdm.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
+$(objdir)cpu/m68k/m68kopdm.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kopdm.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo Compiling Musashi MC680x0 core \(m68kopdm.c\)...
-	@$(CC) $(CFLAGS) -c $(objdir)depend/generated/m68kopdm.c -o $(objdir)cpu/m68k/m68kopdm.o
+	@$(CC) $(CFLAGS) -c $(objdir)dep/generated/m68kopdm.c -o $(objdir)cpu/m68k/m68kopdm.o
 
-$(objdir)cpu/m68k/m68kopnz.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)depend/generated/m68kops.h $(objdir)depend/generated/m68kopnz.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
+$(objdir)cpu/m68k/m68kopnz.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kopnz.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo Compiling Musashi MC680x0 core \(m68kopnz.c\)...
-	@$(CC) $(CFLAGS) -c $(objdir)depend/generated/m68kopnz.c -o $(objdir)cpu/m68k/m68kopnz.o
+	@$(CC) $(CFLAGS) -c $(objdir)dep/generated/m68kopnz.c -o $(objdir)cpu/m68k/m68kopnz.o
 
-$(objdir)depend/generated/m68kops.h: $(objdir)cpu/m68k/m68kmake.exe $(srcdir)cpu/m68k/m68k_in.c
-	$(objdir)/cpu/m68k/m68kmake $(objdir)depend/generated/ $(srcdir)cpu/m68k/m68k_in.c
+$(objdir)dep/generated/m68kops.h: $(objdir)cpu/m68k/m68kmake.exe $(srcdir)cpu/m68k/m68k_in.c
+	$(objdir)/cpu/m68k/m68kmake $(objdir)dep/generated/ $(srcdir)cpu/m68k/m68k_in.c
 
 $(objdir)cpu/m68k/m68kmake.exe: $(srcdir)cpu/m68k/m68kmake.c
 	@echo Compiling Musashi MC680x0 core \(m68kmake.c\)...
@@ -521,7 +526,7 @@ $(objdir)cpu/m68k/m68kmake.exe: $(srcdir)cpu/m68k/m68kmake.c
 ctv.d ctv.o:	$(ctv.h)
 
 $(ctv.h):	ctv_make.cpp
-	@echo Generating $(srcdir)depend/generated/$(@F)...
+	@echo Generating $(srcdir)dep/generated/$(@F)...
 	@$(CC) -mconsole $(CXXFLAGS) $(LDFLAGS) $< \
 		-o $(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe)
 	@$(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe) >$@
@@ -532,8 +537,8 @@ $(ctv.h):	ctv_make.cpp
 
 toa_bcu2.d toa_bcu2.o toa_gp9001.d toa_gp9001.o: $(toa_gp9001_func.h)
 
-$(toa_gp9001_func.h):	$(srcdir)depend/scripts/toa_gp9001_func.pl
-	@$(srcdir)depend/scripts/toa_gp9001_func.pl -o $(toa_gp9001_func.h)
+$(toa_gp9001_func.h):	$(srcdir)dep/scripts/toa_gp9001_func.pl
+	@$(srcdir)dep/scripts/toa_gp9001_func.pl -o $(toa_gp9001_func.h)
 
 #
 #	Extra rules for generated header file neo_sprite_func.h, needed by neo_sprite.cpp
@@ -541,8 +546,8 @@ $(toa_gp9001_func.h):	$(srcdir)depend/scripts/toa_gp9001_func.pl
 
 neo_sprite.d neo_sprite.o: $(neo_sprite_func.h)
 
-$(neo_sprite_func.h):	$(srcdir)depend/scripts/neo_sprite_func.pl
-	@$(srcdir)depend/scripts/neo_sprite_func.pl -o $(neo_sprite_func.h)
+$(neo_sprite_func.h):	$(srcdir)dep/scripts/neo_sprite_func.pl
+	@$(srcdir)dep/scripts/neo_sprite_func.pl -o $(neo_sprite_func.h)
 
 #
 #	Extra rules for generated header file cave_tile_func.h, needed by cave_tile.cpp
@@ -550,8 +555,8 @@ $(neo_sprite_func.h):	$(srcdir)depend/scripts/neo_sprite_func.pl
 
 cave_tile.d cave_tile.o: $(cave_tile_func.h)
 
-$(cave_tile_func.h):	$(srcdir)depend/scripts/cave_tile_func.pl
-	@$(srcdir)depend/scripts/cave_tile_func.pl -o $(cave_tile_func.h)
+$(cave_tile_func.h):	$(srcdir)dep/scripts/cave_tile_func.pl
+	@$(srcdir)dep/scripts/cave_tile_func.pl -o $(cave_tile_func.h)
 
 #
 #	Extra rules for generated header file cave_sprite_func.h, needed by cave_sprite.cpp
@@ -559,8 +564,8 @@ $(cave_tile_func.h):	$(srcdir)depend/scripts/cave_tile_func.pl
 
 cave_sprite.d cave_sprite.o: $(cave_sprite_func.h)
 
-$(cave_sprite_func.h):	$(srcdir)depend/scripts/cave_sprite_func.pl
-	@$(srcdir)depend/scripts/cave_sprite_func.pl -o $(cave_sprite_func.h)
+$(cave_sprite_func.h):	$(srcdir)dep/scripts/cave_sprite_func.pl
+	@$(srcdir)dep/scripts/cave_sprite_func.pl -o $(cave_sprite_func.h)
 
 #
 #	Extra rules for generated header file psikyo_tile_func.h / psikyo_sprite_func.h, needed by psikyo_tile.cpp / psikyo_sprite.cpp
@@ -568,8 +573,8 @@ $(cave_sprite_func.h):	$(srcdir)depend/scripts/cave_sprite_func.pl
 
 psikyo_tile.d psikyo_tile.o psikyosprite.d psikyo_sprite.o: $(psikyo_tile_func.h)
 
-$(psikyo_tile_func.h):	$(srcdir)depend/scripts/psikyo_tile_func.pl
-	$(srcdir)depend/scripts/psikyo_tile_func.pl -o $(psikyo_tile_func.h)
+$(psikyo_tile_func.h):	$(srcdir)dep/scripts/psikyo_tile_func.pl
+	$(srcdir)dep/scripts/psikyo_tile_func.pl -o $(psikyo_tile_func.h)
 
 #
 #	Extra rules for generated header file pgm_sprite.h, needed by pgm_draw.cpp
@@ -578,7 +583,7 @@ $(psikyo_tile_func.h):	$(srcdir)depend/scripts/psikyo_tile_func.pl
 pgm_draw.d pgm_draw.o:	$(pgm_sprite.h)
 
 $(pgm_sprite.h):	pgm_sprite_create.cpp
-	@echo Generating $(srcdir)depend/generated/$(@F)...
+	@echo Generating $(srcdir)dep/generated/$(@F)...
 	@$(CC) -mconsole $(CXXFLAGS) $(LDFLAGS) $< \
 		-o $(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe)
 	@$(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe) >$@
@@ -679,7 +684,7 @@ else
 endif
 	@echo
 	@mkdir -p $(foreach dir, $(alldir),$(objdir)$(dir))
-	@mkdir -p $(srcdir)depend/generated
+	@mkdir -p $(srcdir)dep/generated
 
 cleandep:
 	@echo Removing depend files from $(objdir)...
@@ -688,7 +693,7 @@ cleandep:
 touch:
 	@echo Marking all targets for $(NAME) as uptodate...
 	-@touch $(NAME).exe
-	-@touch -c -r $(NAME).exe $(srcdir)/depend/generated/*
+	-@touch -c -r $(NAME).exe $(srcdir)/dep/generated/*
 	-@for dir in $(alldir); do touch -c  -r $(NAME).exe $(objdir)$$dir/*; done
 
 clean:

makefile.vc

@@ -17,6 +17,7 @@ unexport
 
 # Specify the name of the executable file, without ".exe"
 NAME = fba
+COMPILENAME = 3
 
 ifdef BUILD_X64_EXE
 ifdef BUILD_A68K
@@ -38,19 +39,24 @@ else
 endif
 
 ifndef BUILD_X86_ASM
-	NAME := $(NAME)n
+	NAME := $(NAME)x
+	COMPILENAME := $(COMPILENAME)x
 endif
 ifdef BUILD_X64_EXE
 	NAME = fba64
+	COMPILENAME = 6
 endif
 ifdef	DEBUG
 	NAME := $(NAME)d
+	COMPILENAME := $(COMPILENAME)d
 endif
 ifdef	SYMBOL
 	NAME := $(NAME)s
+	COMPILENAME := $(COMPILENAME)s
 endif
 ifndef UNICODE
 	NAME := $(NAME)a
+	COMPILENAME := $(COMPILENAME)a
 endif
 
 cpulevel = 6
@@ -86,20 +92,19 @@ endif
 #	Specify paths/files
 #
 
-objdir	= obj/VC_WIN32/$(NAME)/
+objdir	= obj/VC/$(COMPILENAME)/
 srcdir	= src/
 
 include makefile.burn_rules
 include makefile.burner_win32_rules
 
-incdir	= $(foreach dir,$(alldir),/I$(srcdir)$(dir)) /I$(objdir)depend/generated
+incdir	= $(foreach dir,$(alldir),/I$(srcdir)$(dir)) /I$(objdir)dep/generated
 
 ifdef UNICODE
 # lib	= unicows.lib
 endif
 
-lib	+=	user32.lib gdi32.lib comdlg32.lib comctl32.lib shell32.lib winmm.lib ole32.lib shlwapi.lib \
-		advapi32.lib setupapi.lib
+lib	+=	user32.lib gdi32.lib comdlg32.lib comctl32.lib shell32.lib winmm.lib ole32.lib shlwapi.lib advapi32.lib setupapi.lib
 
 ifdef	BUILD_X86_ASM
 autobj += hq3xs.o hq_shared32.o
@@ -109,18 +114,18 @@ ifdef	BUILD_A68K
 a68k.o	= $(objdir)cpu/a68k/a68k.o
 endif
 
-license.rtf = $(srcdir)depend/generated/license.rtf
-driverlist.h = $(srcdir)depend/generated/driverlist.h
-ctv.h	= $(srcdir)depend/generated/ctv.h
-toa_gp9001_func.h = $(srcdir)depend/generated/toa_gp9001_func.h
-neo_sprite_func.h = $(srcdir)depend/generated/neo_sprite_func.h
-cave_tile_func.h = $(srcdir)depend/generated/cave_tile_func.h
-cave_sprite_func.h = $(srcdir)depend/generated/cave_sprite_func.h
-psikyo_tile_func.h = $(srcdir)depend/generated/psikyo_tile_func.h
-pgm_sprite.h = $(srcdir)depend/generated/pgm_sprite.h
-build_details.h = $(srcdir)depend/generated/build_details.h
+license.rtf = $(srcdir)dep/generated/license.rtf
+driverlist.h = $(srcdir)dep/generated/driverlist.h
+ctv.h	= $(srcdir)dep/generated/ctv.h
+toa_gp9001_func.h = $(srcdir)dep/generated/toa_gp9001_func.h
+neo_sprite_func.h = $(srcdir)dep/generated/neo_sprite_func.h
+cave_tile_func.h = $(srcdir)dep/generated/cave_tile_func.h
+cave_sprite_func.h = $(srcdir)dep/generated/cave_sprite_func.h
+psikyo_tile_func.h = $(srcdir)dep/generated/psikyo_tile_func.h
+pgm_sprite.h = $(srcdir)dep/generated/pgm_sprite.h
+build_details.h = $(srcdir)dep/generated/build_details.h
 
-allobj	= $(objdir)cpu/m68k/m68kcpu.o $(objdir)cpu/m68k/m68kopnz.o $(objdir)cpu/m68k/m68kopdm.o $(objdir)cpu/m68k/m68kopac.o $(objdir)cpu/m68k/m68kops.o $(objdir)burner/platform/win32/resource.res \
+allobj	= $(objdir)cpu/m68k/m68kcpu.o $(objdir)cpu/m68k/m68kopnz.o $(objdir)cpu/m68k/m68kopdm.o $(objdir)cpu/m68k/m68kopac.o $(objdir)cpu/m68k/m68kops.o $(objdir)burner/win32/resource.res \
 	  $(foreach file,$(autobj:.o=.c), \
 		$(foreach dir,$(alldir),$(subst $(srcdir),$(objdir), \
 		$(firstword $(subst .c,.o,$(wildcard $(srcdir)$(dir)/$(file))))))) \
@@ -146,7 +151,7 @@ CXX	= cl
 LD	= link
 AS	= nasm
 
-incdir +=  /Isrc\depend\VC\include
+incdir +=  /Isrc\dep\VC\include
 
 ifndef BUILD_X64_EXE
 LDFLAGS	=  /NOLOGO /INCREMENTAL:NO /MACHINE:X86 /LIBPATH:src\VC\lib /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcd.lib # /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:libcp.lib /NODEFAULTLIB:libcpd.lib /NODEFAULTLIB:libcpmt.lib /NODEFAULTLIB:libcpmtd.lib
@@ -191,7 +196,7 @@ ifdef BUILD_X64_EXE
 endif
 
 ifdef	SYMBOL
-	CFLAGS	 = /nologo /Od /GF /GS /RTC1 /Zi /Zc:forScope /MTd /EHsc /Fp$(objdir)/depend/generated/ # /Wall
+	CFLAGS	 = /nologo /Od /GF /GS /RTC1 /Zi /Zc:forScope /MTd /EHsc /Fp$(objdir)/dep/generated/ # /Wall
 	ASFLAGS += -g
 	LDFLAGS += /DEBUG
 	DEF	:= $(DEF) /D_DEBUG
@@ -291,9 +296,9 @@ endif
 
 burn.o burn.d:	driverlist.h
 
-$(driverlist.h): $(drvobj) $(srcdir)depend/scripts/gamelist.pl
+$(driverlist.h): $(drvobj) $(srcdir)dep/scripts/gamelist.pl
 ifdef	PERL
-	@$(srcdir)depend/scripts/gamelist.pl -o $@ -l gamelist.txt \
+	@$(srcdir)dep/scripts/gamelist.pl -o $@ -l gamelist.txt \
 		$(filter %.cpp,$(foreach file,$(drvobj:.o=.cpp),$(foreach dir,$(alldir), \
 		$(firstword $(wildcard $(srcdir)$(dir)/$(file))))))
 else
@@ -322,10 +327,10 @@ endif
 
 resource.res resource.d:	app.rc version.rc version.h $(build_details.h) $(license.rtf)
 
-$(license.rtf): $(srcdir)license.txt $(srcdir)depend/scripts/license2rtf.pl
+$(license.rtf): $(srcdir)license.txt $(srcdir)dep/scripts/license2rtf.pl
 
 ifdef	PERL
-	$(srcdir)depend/scripts/license2rtf.pl $< -o $(srcdir)depend/generated/$(@F:.rc=.rtf)
+	$(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf)
 else
 ifeq ($(MAKELEVEL),2)
 	@echo
@@ -343,9 +348,9 @@ resource.rc: app.rc $(license.rc) $(srcdir)burner/resource/fba.ico $(srcdir)burn
 
 about.o about.d systeminfo.o systeminfo.d: $(build_details.h)
 
-$(build_details.h):	$(srcdir)depend/scripts/build_details.cpp
-	$(CC) $(CFLAGS) $< /Fo$(objdir)depend/generated/ /Fe$(objdir)depend/generated/build_details.exe
-	$(objdir)depend/generated/build_details.exe >$@
+$(build_details.h):	$(srcdir)dep/scripts/build_details.cpp
+	$(CC) $(CFLAGS) $< /Fo$(objdir)dep/generated/ /Fe$(objdir)dep/generated/build_details.exe
+	$(objdir)dep/generated/build_details.exe >$@
 
 #
 #	Compile 68000 cores
@@ -364,28 +369,28 @@ endif
 
 # Musashi
 
-$(objdir)cpu/m68k/m68kcpu.o: $(srcdir)cpu/m68k/m68kcpu.c $(objdir)depend/generated/m68kops.h $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
+$(objdir)cpu/m68k/m68kcpu.o: $(srcdir)cpu/m68k/m68kcpu.c $(objdir)dep/generated/m68kops.h $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo "Compiling Musashi MC680x0 core... "
 	$(CC) $(CFLAGS) /DINLINE="__inline static" /c $(srcdir)cpu/m68k/m68kcpu.c /Fo$(objdir)cpu/m68k/m68kcpu.o
 
-$(objdir)cpu/m68k/m68kops.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)depend/generated/m68kops.h $(objdir)depend/generated/m68kops.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
+$(objdir)cpu/m68k/m68kops.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kops.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo "Compiling Musashi MC680x0 core... "
-	$(CC) $(CFLAGS) /DINLINE="__inline static" /c $(objdir)depend/generated/m68kops.c /Fo$(objdir)cpu/m68k/m68kops.o
+	$(CC) $(CFLAGS) /DINLINE="__inline static" /c $(objdir)dep/generated/m68kops.c /Fo$(objdir)cpu/m68k/m68kops.o
 
-$(objdir)cpu/m68k/m68kopac.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)depend/generated/m68kops.h $(objdir)depend/generated/m68kopac.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
+$(objdir)cpu/m68k/m68kopac.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kopac.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo "Compiling Musashi MC680x0 core... "
-	$(CC) $(CFLAGS) /DINLINE="__inline static" /c $(objdir)depend/generated/m68kopac.c /Fo$(objdir)cpu/m68k/m68kopac.o
+	$(CC) $(CFLAGS) /DINLINE="__inline static" /c $(objdir)dep/generated/m68kopac.c /Fo$(objdir)cpu/m68k/m68kopac.o
 
-$(objdir)cpu/m68k/m68kopdm.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)depend/generated/m68kops.h $(objdir)depend/generated/m68kopdm.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
+$(objdir)cpu/m68k/m68kopdm.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kopdm.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo "Compiling Musashi MC680x0 core... "
-	$(CC) $(CFLAGS) /DINLINE="__inline static" /c $(objdir)depend/generated/m68kopdm.c /Fo$(objdir)cpu/m68k/m68kopdm.o
+	$(CC) $(CFLAGS) /DINLINE="__inline static" /c $(objdir)dep/generated/m68kopdm.c /Fo$(objdir)cpu/m68k/m68kopdm.o
 
-$(objdir)cpu/m68k/m68kopnz.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)depend/generated/m68kops.h $(objdir)depend/generated/m68kopnz.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
+$(objdir)cpu/m68k/m68kopnz.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kopnz.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
 	@echo "Compiling Musashi MC680x0 core... "
-	$(CC) $(CFLAGS) /DINLINE="__inline static" /c $(objdir)depend/generated/m68kopnz.c /Fo$(objdir)cpu/m68k/m68kopnz.o
+	$(CC) $(CFLAGS) /DINLINE="__inline static" /c $(objdir)dep/generated/m68kopnz.c /Fo$(objdir)cpu/m68k/m68kopnz.o
 
-$(objdir)depend/generated/m68kops.h: $(objdir)cpu/m68k/m68kmake.exe $(srcdir)cpu/m68k/m68k_in.c
-	$(objdir)/cpu/m68k/m68kmake $(objdir)depend/generated/ $(srcdir)cpu/m68k/m68k_in.c
+$(objdir)dep/generated/m68kops.h: $(objdir)cpu/m68k/m68kmake.exe $(srcdir)cpu/m68k/m68k_in.c
+	$(objdir)/cpu/m68k/m68kmake $(objdir)dep/generated/ $(srcdir)cpu/m68k/m68k_in.c
 
 $(objdir)cpu/m68k/m68kmake.exe: $(srcdir)cpu/m68k/m68kmake.c
 	@echo "Compiling Musashi MC680x0 core... "
@@ -399,7 +404,7 @@ $(objdir)cpu/m68k/m68kmake.exe: $(srcdir)cpu/m68k/m68kmake.c
 ctv.o:	$(ctv.h)
 
 $(ctv.h):	ctv_make.cpp
-	@echo Generating... $(srcdir)depend/generated/$(@F)
+	@echo Generating... $(srcdir)dep/generated/$(@F)
 	$(CC) $(CXXFLAGS) $< /Fo$(subst $(srcdir),$(objdir),$(<D))/ /Fe$(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe) /link $(LDFLAGS) /SUBSYSTEM:CONSOLE
 	$(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe) >$@
 
@@ -409,8 +414,8 @@ $(ctv.h):	ctv_make.cpp
 
 toa_bcu2.o toa_gp9001.o: $(toa_gp9001_func.h)
 
-$(toa_gp9001_func.h):	$(srcdir)depend/scripts/toa_gp9001_func.pl
-	$(srcdir)depend/scripts/toa_gp9001_func.pl -o $(toa_gp9001_func.h)
+$(toa_gp9001_func.h):	$(srcdir)dep/scripts/toa_gp9001_func.pl
+	$(srcdir)dep/scripts/toa_gp9001_func.pl -o $(toa_gp9001_func.h)
 
 #
 #	Extra rules for generated header file neo_sprite_func.h, needed by neo_sprite.cpp
@@ -418,8 +423,8 @@ $(toa_gp9001_func.h):	$(srcdir)depend/scripts/toa_gp9001_func.pl
 
 neo_sprite.o: $(neo_sprite_func.h)
 
-$(neo_sprite_func.h):	$(srcdir)depend/scripts/neo_sprite_func.pl
-	$(srcdir)depend/scripts/neo_sprite_func.pl -o $(neo_sprite_func.h)
+$(neo_sprite_func.h):	$(srcdir)dep/scripts/neo_sprite_func.pl
+	$(srcdir)dep/scripts/neo_sprite_func.pl -o $(neo_sprite_func.h)
 
 #
 #	Extra rules for generated header file cave_tile_func.h, needed by cave_tile.cpp
@@ -427,8 +432,8 @@ $(neo_sprite_func.h):	$(srcdir)depend/scripts/neo_sprite_func.pl
 
 cave_tile.o: $(cave_tile_func.h)
 
-$(cave_tile_func.h):	$(srcdir)depend/scripts/cave_tile_func.pl
-	$(srcdir)depend/scripts/cave_tile_func.pl -o $(cave_tile_func.h)
+$(cave_tile_func.h):	$(srcdir)dep/scripts/cave_tile_func.pl
+	$(srcdir)dep/scripts/cave_tile_func.pl -o $(cave_tile_func.h)
 
 #
 #	Extra rules for generated header file cave_sprite_func.h, needed by cave_sprite.cpp
@@ -436,8 +441,8 @@ $(cave_tile_func.h):	$(srcdir)depend/scripts/cave_tile_func.pl
 
 cave_sprite.o: $(cave_sprite_func.h)
 
-$(cave_sprite_func.h):	$(srcdir)depend/scripts/cave_sprite_func.pl
-	$(srcdir)depend/scripts/cave_sprite_func.pl -o $(cave_sprite_func.h)
+$(cave_sprite_func.h):	$(srcdir)dep/scripts/cave_sprite_func.pl
+	$(srcdir)dep/scripts/cave_sprite_func.pl -o $(cave_sprite_func.h)
 
 #
 #	Extra rules for generated header file psikyo_tile_func.h / psikyo_sprite_func.h, needed by psikyo_tile.cpp / psikyo_sprite.cpp
@@ -445,8 +450,8 @@ $(cave_sprite_func.h):	$(srcdir)depend/scripts/cave_sprite_func.pl
 
 psikyo_tile.o psikyo_sprite.o: $(psikyo_tile_func.h)
 
-$(psikyo_tile_func.h):	$(srcdir)depend/scripts/psikyo_tile_func.pl
-	$(srcdir)depend/scripts/psikyo_tile_func.pl -o $(psikyo_tile_func.h)
+$(psikyo_tile_func.h):	$(srcdir)dep/scripts/psikyo_tile_func.pl
+	$(srcdir)dep/scripts/psikyo_tile_func.pl -o $(psikyo_tile_func.h)
 	
 #
 #	Extra rules for generated header file pgm_sprite.h, needed by pgm_draw.cpp
@@ -455,7 +460,7 @@ $(psikyo_tile_func.h):	$(srcdir)depend/scripts/psikyo_tile_func.pl
 pgm_draw.d pgm_draw.o:	$(pgm_sprite.h)
 
 $(pgm_sprite.h):	pgm_sprite_create.cpp
-	@echo Generating... $(srcdir)depend/generated/$(@F)
+	@echo Generating... $(srcdir)dep/generated/$(@F)
 	$(CC) $(CXXFLAGS) $< /Fo$(subst $(srcdir),$(objdir),$(<D))/ /Fe$(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe) /link $(LDFLAGS) /SUBSYSTEM:CONSOLE
 	$(subst $(srcdir),$(objdir),$(<D))/$(<F:.cpp=.exe) >$@
 
@@ -515,17 +520,17 @@ endif
 	@echo
 ifeq ($(MAKEOS),cygwin)
 	@mkdir -p $(foreach dir, $(alldir),$(objdir)$(dir))
-	@mkdir -p $(srcdir)depend/generated
+	@mkdir -p $(srcdir)dep/generated
 else
 	@echo nt
 	@mkdir $(foreach dir, $(alldir),$(objdir)$(dir))
-	@mkdir $(srcdir)depend/generated
+	@mkdir $(srcdir)dep/generated
 endif
 
 touch:
 	@echo Marking all targets for $(NAME) as uptodate...
 	-@touch $(NAME).exe
-	-@touch -c -r $(NAME).exe $(srcdir)/depend/generated/*
+	-@touch -c -r $(NAME).exe $(srcdir)/dep/generated/*
 	-@for dir in $(alldir); do touch -c  -r $(NAME).exe $(objdir)$$dir/*; done
 
 clean: