diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble.cpp
index 5e3693e..48cff31 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble.cpp
@@ -37,11 +37,11 @@
//=========================================================================
-#include "neopop.h"
+#include "../neopop.h"
#include "TLCS900h_disassemble.h"
#include "TLCS900h_registers.h"
#include "TLCS900h_interpret.h"
-#include "mem.h"
+#include "../mem.h"
namespace TLCS900H
{
diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_dst.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_dst.cpp
index 69e8f08..ff35e1f 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_dst.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_dst.cpp
@@ -33,7 +33,7 @@
//=========================================================================
-#include "neopop.h"
+#include "../neopop.h"
#include "TLCS900h_disassemble.h"
#include "TLCS900h_registers.h"
#include "TLCS900h_interpret.h"
diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_extra.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_extra.cpp
index 70bf987..cd69775 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_extra.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_extra.cpp
@@ -37,7 +37,7 @@
//=========================================================================
-#include "neopop.h"
+#include "../neopop.h"
#include "TLCS900h_disassemble.h"
#include "TLCS900h_interpret.h"
diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_reg.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_reg.cpp
index 5fa1d5d..9d0eb10 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_reg.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_reg.cpp
@@ -39,7 +39,7 @@
//---------------------------------------------------------------------------
*/
-#include "neopop.h"
+#include "../neopop.h"
#include "TLCS900h_disassemble.h"
#include "TLCS900h_registers.h"
#include "TLCS900h_interpret.h"
diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_src.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_src.cpp
index e57ecaa..27e42d5 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_src.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_disassemble_src.cpp
@@ -37,7 +37,7 @@
//=========================================================================
-#include "neopop.h"
+#include "../neopop.h"
#include "TLCS900h_disassemble.h"
#include "TLCS900h_registers.h"
#include "TLCS900h_interpret.h"
diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret.cpp
index c16b8ed..275e799 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret.cpp
@@ -52,11 +52,11 @@
//---------------------------------------------------------------------------
*/
-#include "neopop.h"
+#include "../neopop.h"
#include "TLCS900h_registers.h"
-#include "interrupt.h"
-#include "mem.h"
-#include "bios.h"
+#include "../interrupt.h"
+#include "../mem.h"
+#include "../bios.h"
#include "TLCS900h_interpret.h"
#include "TLCS900h_interpret_single.h"
#include "TLCS900h_interpret_src.h"
diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_dst.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_dst.cpp
index 93b3706..e59b3d5 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_dst.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_dst.cpp
@@ -49,10 +49,10 @@
//---------------------------------------------------------------------------
*/
-#include "neopop.h"
+#include "../neopop.h"
#include "TLCS900h_interpret.h"
#include "TLCS900h_registers.h"
-#include "mem.h"
+#include "../mem.h"
namespace TLCS900H
{
diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_reg.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_reg.cpp
index 81e90d5..4d928ed 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_reg.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_reg.cpp
@@ -62,11 +62,11 @@
//---------------------------------------------------------------------------
*/
-#include "neopop.h"
+#include "../neopop.h"
#include "TLCS900h_interpret.h"
#include "TLCS900h_registers.h"
-#include "mem.h"
-#include "dma.h"
+#include "../mem.h"
+#include "../dma.h"
namespace TLCS900H
{
diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_single.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_single.cpp
index 08aded2..1196e36 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_single.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_single.cpp
@@ -46,11 +46,11 @@
//---------------------------------------------------------------------------
*/
-#include "neopop.h"
+#include "../neopop.h"
#include "TLCS900h_interpret.h"
#include "TLCS900h_registers.h"
-#include "mem.h"
-#include "interrupt.h"
+#include "../mem.h"
+#include "../interrupt.h"
namespace TLCS900H
{
diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_src.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_src.cpp
index 35b44e7..9e16ea5 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_src.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_interpret_src.cpp
@@ -65,10 +65,10 @@
//---------------------------------------------------------------------------
*/
-#include "neopop.h"
+#include "../neopop.h"
#include "TLCS900h_interpret.h"
#include "TLCS900h_registers.h"
-#include "mem.h"
+#include "../mem.h"
namespace TLCS900H
{
diff --git a/mednafen/ngp-09333/TLCS-900h/TLCS900h_registers.cpp b/mednafen/ngp-09333/TLCS-900h/TLCS900h_registers.cpp
index 7e1ea01..dc7c97d 100644
--- a/mednafen/ngp-09333/TLCS-900h/TLCS900h_registers.cpp
+++ b/mednafen/ngp-09333/TLCS-900h/TLCS900h_registers.cpp
@@ -35,8 +35,8 @@
//---------------------------------------------------------------------------
*/
-#include "neopop.h"
-#include "interrupt.h"
+#include "../neopop.h"
+#include "../interrupt.h"
#include "TLCS900h_registers.h"
namespace TLCS900H
diff --git a/mednafen/ngp-09333/neopop.h b/mednafen/ngp-09333/neopop.h
index 0a6f06e..2da6f2b 100644
--- a/mednafen/ngp-09333/neopop.h
+++ b/mednafen/ngp-09333/neopop.h
@@ -77,6 +77,9 @@ RomInfo;
//RomHeader
typedef struct
{
+#ifdef _WIN32
+#pragma pack(push, 1)
+#endif
uint8 licence[28]; // 0x00 - 0x1B
uint32 startPC; // 0x1C - 0x1F
uint16 catalog; // 0x20 - 0x21
@@ -88,7 +91,12 @@ typedef struct
uint32 reserved2; // 0x34 - 0x37
uint32 reserved3; // 0x38 - 0x3B
uint32 reserved4; // 0x3C - 0x3F
+#ifdef _WIN32
+#pragma pack(pop)
+} RomHeader;
+#else
} __attribute__((__packed__)) RomHeader;
+#endif
//=============================================================================
diff --git a/msvc/ngp/msvc-2010/msvc-2010.vcxproj b/msvc/ngp/msvc-2010/msvc-2010.vcxproj
index 9f20d03..f0fcbce 100644
--- a/msvc/ngp/msvc-2010/msvc-2010.vcxproj
+++ b/msvc/ngp/msvc-2010/msvc-2010.vcxproj
@@ -25,33 +25,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -112,7 +113,7 @@
false
$(OutDir)$(ProjectName).pch
MultiThreadedDebug
- _DEBUG;_WIN32;_LIB;LSB_FIRST;WANT_NGP_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.26;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;PSS_STYLE=2;MEDNAFEN_VERSION_NUMERIC=926;%(PreprocessorDefinitions)
+ _DEBUG;_WIN32;_LIB;LSB_FIRST;WANT_NGP_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.26;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;PSS_STYLE=2;MEDNAFEN_VERSION_NUMERIC=926;%(PreprocessorDefinitions);WANT_NEW_API;_CRT_SECURE_NO_WARNINGS
Callcap
$(SolutionDir)\..\..\;$(SolutionDir)\..\..\mednafen;$(SolutionDir)\..\..\mednafen\cdrom;$(SolutionDir)\..\..\mednafen\include;$(SolutionDir)\..\..\mednafen\sound;$(SolutionDir)\..\..\mednafen\ngp;$(SolutionDir)\..\..\mednafen\hw_cpu;%(AdditionalIncludeDirectories)
@@ -134,7 +135,7 @@
false
$(OutDir)$(ProjectName).pch
MultiThreaded
- NDEBUG;_WIN32;_LIB;LSB_FIRST;WANT_NGP_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.26;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;PSS_STYLE=2;MEDNAFEN_VERSION_NUMERIC=926;%(PreprocessorDefinitions)
+ NDEBUG;_WIN32;_LIB;LSB_FIRST;WANT_NGP_EMU;WANT_32BPP;SIZEOF_DOUBLE=8;MEDNAFEN_VERSION=0.9.26;MPC_FIXED_POINT;__LIBRETRO__;_LOW_ACCURACY;WANT_STEREO_SOUND;FRONTEND_SUPPORTS_RGB565;PSS_STYLE=2;MEDNAFEN_VERSION_NUMERIC=926;%(PreprocessorDefinitions);WANT_NEW_API;_CRT_SECURE_NO_WARNINGS
$(SolutionDir)\..\..\;$(SolutionDir)\..\..\mednafen;$(SolutionDir)\..\..\mednafen\cdrom;$(SolutionDir)\..\..\mednafen\include;$(SolutionDir)\..\..\mednafen\sound;$(SolutionDir)\..\..\mednafen\ngp;$(SolutionDir)\..\..\mednafen\hw_cpu;%(AdditionalIncludeDirectories)
diff --git a/msvc/ngp/msvc-2010/msvc-2010.vcxproj.filters b/msvc/ngp/msvc-2010/msvc-2010.vcxproj.filters
index 874120c..becad34 100644
--- a/msvc/ngp/msvc-2010/msvc-2010.vcxproj.filters
+++ b/msvc/ngp/msvc-2010/msvc-2010.vcxproj.filters
@@ -80,84 +80,6 @@
Source Files\mednafen
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
-
- Source Files\mednafen\ngp\TLCS-900h
-
Source Files\mednafen\hw_cpu\z80-fuse
@@ -191,5 +113,86 @@
Source Files\mednafen\sound
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp\TLCS-900h
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen\ngp
+
+
+ Source Files\mednafen
+
\ No newline at end of file