Rebuild visual studio 2010 ide project

Fix up some #defines to allow them to be overridden by the makefiles without causing lots of warnings

src/burn/snd/ym2413.c

@@ -30,9 +30,11 @@ to do:
 #include "state.h"
 #include "ym2413.h"
 
+#ifndef MAME_INLINE
 #ifndef MAME_INLINE
 #define MAME_INLINE static inline
 #endif
+#endif
 
 #ifndef PI
 #define PI 3.14159265358979323846

src/burn/state.h

@@ -7,8 +7,10 @@
 #if !defined(__cplusplus) && defined(_XBOX)
 #define C_INLINE _inline
 #else
+#ifndef C_INLINE
 #define C_INLINE inline
 #endif
+#endif
 
 /* Scan driver data */
 INT32 BurnAreaScan(INT32 nAction, INT32* pnMin);

src/burner/win32/about.cpp

@@ -105,8 +105,11 @@ static bool AboutDrawStrings(unsigned int nControlID, LPDRAWITEMSTRUCT pdis)
 
 			RECT rect = pdis->rcItem;
 			rect.top += 1;
-
+#ifdef MMX
 			_stprintf(szBuild, _T("built on ") _T(MAKE_STRING(BUILD_DATE)) _T(", ") _T(MAKE_STRING(BUILD_TIME)) _T(" (") _T(MAKE_STRING(BUILD_CHAR)) _T(", ") _T(MAKE_STRING(BUILD_COMP)) _T(", ") _T(MAKE_STRING(BUILD_CPU)) _T("%s)"), MMX ? _T(", MMX") : _T(""));
+#else
+			_stprintf(szBuild, _T("built on ") _T(MAKE_STRING(BUILD_DATE)) _T(", ") _T(MAKE_STRING(BUILD_TIME)) _T(" (") _T(MAKE_STRING(BUILD_CHAR)) _T(", ") _T(MAKE_STRING(BUILD_COMP)) _T(", ") _T(MAKE_STRING(BUILD_CPU)) _T("%s)"), _T(""));
+#endif 
 
 			myDrawText(pdis->hDC, &rect, szBuild, -2, RGB(0xDB, 0xDB, 0xDB), DT_CENTER);
 #endif

src/burner/win32/burner_win32.h

@@ -14,8 +14,10 @@
 #define STRICT
 
 #if defined (_UNICODE)
+#ifndef UNICODE
  #define UNICODE
 #endif
+#endif
 
 #define WIN32_LEAN_AND_MEAN
 #define OEMRESOURCE

src/dep/kaillera/client/net.cpp

@@ -58,7 +58,13 @@ int WINAPI Empty_Kaillera_End_Game()
 
 int Init_Network(void)
 {
-	Kaillera_HDLL = LoadLibrary("kailleraclient.dll");
+	#if defined (_UNICODE)
+		Kaillera_HDLL = LoadLibrary(L"kailleraclient.dll");
+	#else
+		Kaillera_HDLL = LoadLibrary("kailleraclient.dll");
+	#endif
+
+	
 
 	if (Kaillera_HDLL != NULL)
 	{

src/dep/vs2010/pre.bat

@@ -1,7 +1,8 @@
 @echo off
-cd src/depend
+cd ..\..\src\dep\
 mkdir generated
 cd scripts
+echo %CD%
 echo running perl scripts
 perl cave_sprite_func.pl -o ../generated/cave_sprite_func.h
 perl license2rtf.pl -o ../generated/license.rtf ../../license.txt
@@ -9,20 +10,24 @@ perl cave_tile_func.pl -o ../generated/cave_tile_func.h
 perl neo_sprite_func.pl -o ../generated/neo_sprite_func.h
 perl psikyo_tile_func.pl -o ../generated/psikyo_tile_func.h
 perl toa_gp9001_func.pl -o ../generated/toa_gp9001_func.h
-perl gamelist.pl -o ../generated/driverlist.h -l ../../gamelist.txt ../../burn/drivers/capcom ../../burn/drivers/cave ../../burn/drivers/cps3 ../../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/taito ../../burn/drivers/toaplan ../../burn/drivers/snes
+perl gamelist.pl -o ../generated/driverlist.h -l ../../gamelist.txt ../../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/neogeo ../../burn/drv/pce ../../burn/drv/pgm ../../burn/drv/pst90s ../../burn/drv/pre90s ../../burn/drv/psikyo ../../burn/drv/sega ../../burn/drv/taito ../../burn/drv/toaplan ../../burn/drv/snes
+
+echo %CD%
 echo building buildinfo
 %1/bin/cl" build_details.cpp
 build_details > ../generated/build_details.h
 del build_details.exe
 del build_details.obj
+
 echo building ctv
 cd ..
 cd ..
 cd burn
-cd drivers
+cd drv
 cd capcom
+echo %CD%
 %1/bin/cl" ctv_make.cpp
-ctv_make > ../../../depend/generated/ctv.h
+ctv_make > ../../../dep/generated/ctv.h
 del ctv_make.exe
 del ctv_make.obj
 
@@ -32,8 +37,9 @@ cd ..
 cd ..
 cd cpu
 cd m68k
+echo %CD%
 %1/bin/cl" /DINLINE="__inline static" m68kmake.c
-m68kmake ../../depend/generated/ m68k_in.c
+m68kmake ../../dep/generated/ m68k_in.c
 del m68kmake.exe
 del m68kmake.obj