Fix issues breaking the MSVC build.

PATCH In review Lv Zheng 2 participants 5 messages Jan 14, 2013 – Jan 15, 2013 ACPI component architecture (acpica)

Share & tools

Lv Zheng

author

2013-01-14 00:35 UTC #0 lore raw

cover Fix issues breaking the MSVC build.

Enhanced ACPI_DEBUG_PRINT macro will break ACPICA compilation on platforms using compilers other than GCC.
This patch set fixes this build breakage issue along with a cleanup that updates the MSVC project / workspace files to make a build working in MSVC.

Lv Zheng (2):
Fix build breakage issue with ACPI_DEBUG_PRINT macro. Update MSVC project/workspace files.

 generate/msvc/AcpiBin.dsp       |   32 ++--
 generate/msvc/AcpiCA.dsw        |  101 +++++++++++
 generate/msvc/AcpiExec.dsp      |  116 ++++++++++++-
 generate/msvc/AcpiNames.dsp     |   52 +++++-
 generate/msvc/AcpiSrc.dsp       |   20 +--
 generate/msvc/AcpiSrc_Linux.dsp |   13 +-
 generate/msvc/AcpiSubsystem.dsp |   45 ++++-
 generate/msvc/AcpiXtract.dsp    |   32 +++-
 generate/msvc/AslCompiler.dsp   |  360 ++++++++++++++++++++++++++++++---------
 source/compiler/aslcompiler.y   |    1 -
 source/compiler/dtparser.y      |    7 +
 source/compiler/prparser.y      |    7 +
 source/include/acoutput.h       |   17 +-
 source/include/platform/acgcc.h |    5 +
 14 files changed, 670 insertions(+), 138 deletions(-)
 create mode 100644 generate/msvc/AcpiCA.dsw

Signature · 1 line

1.7.10

Lv Zheng

author

2013-01-14 00:35 UTC #1 lore raw

PATCH 1/2 Fix build breakage issue with ACPI_DEBUG_PRINT macro.

Enhanced ACPI_DEBUG_PRINT macro will break ACPICA compilation on platforms using compilers other than GCC. This patch fix this build breakage issue.

Signed-off-by Lv Zheng <lv.zheng(a)intel.com>

---
 source/include/acoutput.h       |   17 +++++++++++++----
 source/include/platform/acgcc.h |    5 +++++
 2 files changed, 18 insertions(+), 4 deletions(-)

source/include/acoutput.h +13 -4

index e1ad7d1..dd472c9 100644
@@ -368,10 +368,7 @@
 #define ACPI_DO_WHILE0(a)               a
 #endif
 
-/* DEBUG_PRINT functions */
-
-#define ACPI_DEBUG_PRINT(plist)         ACPI_ACTUAL_DEBUG plist
-#define ACPI_DEBUG_PRINT_RAW(plist)     ACPI_ACTUAL_DEBUG_RAW plist
+#ifdef ACPI_CC_HAS_MACRO_VA_ARGS
 
 /* Helper macros for DEBUG_PRINT */

@@ -391,6 +388,18 @@
     ACPI_DO_DEBUG_PRINT (AcpiDebugPrintRaw, Level, Line, \
         Filename, Modulename, Component, __VA_ARGS__)
 
+/* DEBUG_PRINT functions */
+
+#define ACPI_DEBUG_PRINT(plist)         ACPI_ACTUAL_DEBUG plist
+#define ACPI_DEBUG_PRINT_RAW(plist)     ACPI_ACTUAL_DEBUG_RAW plist
+
+#else
+
+#define ACPI_DEBUG_PRINT(plist)         AcpiDebugPrint plist
+#define ACPI_DEBUG_PRINT_RAW(plist)     AcpiDebugPrintRaw plist
+
+#endif
+
 
 /*
  * Function entry tracing

source/include/platform/acgcc.h +5 -0

index 6ff7743..45729da 100644
@@ -136,4 +136,9 @@
  */
 #define ACPI_UNUSED_VAR __attribute__ ((unused))
 
+/*
+ * Some compilers support va_arg in macro definitions while others not.
+ */
+#define ACPI_CC_HAS_MACRO_VA_ARGS      1
+
 #endif /* __ACGCC_H__ */

Signature · 1 line

1.7.10

Lv Zheng

author

2013-01-14 00:36 UTC #2 lore raw

PATCH 2/2 Update MSVC project/workspace files.

In reply to Lv Zheng

This patch updates MSVC build files to make windows build working. Following fixes have been done to the MSVC files:
1. Add missing .c files into .dsp.
2. Convert abstract paths in .dsp into relative paths.
3. Add AcpiCA.dsw to collect non-Linux projects.
4. Update .dsp, compiling .y/.l using standard GNU flex/bison.
5. Fix link issues in .y.

Signed-off-by Lv Zheng <lv.zheng(a)intel.com>

---
 generate/msvc/AcpiBin.dsp       |   32 ++--
 generate/msvc/AcpiCA.dsw        |  101 +++++++++++
 generate/msvc/AcpiExec.dsp      |  116 ++++++++++++-
 generate/msvc/AcpiNames.dsp     |   52 +++++-
 generate/msvc/AcpiSrc.dsp       |   20 +--
 generate/msvc/AcpiSrc_Linux.dsp |   13 +-
 generate/msvc/AcpiSubsystem.dsp |   45 ++++-
 generate/msvc/AcpiXtract.dsp    |   32 +++-
 generate/msvc/AslCompiler.dsp   |  360 ++++++++++++++++++++++++++++++---------
 source/compiler/aslcompiler.y   |    1 -
 source/compiler/dtparser.y      |    7 +
 source/compiler/prparser.y      |    7 +
 12 files changed, 652 insertions(+), 134 deletions(-)
 create mode 100644 generate/msvc/AcpiCA.dsw

generate/msvc/AcpiBin.dsp +22 ~~-10~~

index cbbb5c5..4cb4770 100755
@@ -37,12 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiBin"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiBin"
+# PROP Output_Dir "AcpiBin"
+# PROP Intermediate_Dir "AcpiBin"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\include" /D "NDEBUG" /D "ACPI_BIN_APP" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
+# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_BIN_APP" /D "__STDC__" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -51,12 +51,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"advapi32.lib"
+# ADD LINK32 kernel32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"advapi32.lib"
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy AcpiBin.exe to libraries
-PostBuild_Cmds=copy acpibin\acpibin.exe ..\..\libraries	dir ..\..\libraries\acpibin.exe
+PostBuild_Cmds=copy acpibin\acpibin.exe ..\..\libraries
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "AcpiBin - Win32 Debug"

@@ -68,12 +68,12 @@ PostBuild_Cmds=copy acpibin\acpibin.exe ..\..\libraries	dir ..\..\libraries\acpi
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "/acpica/generate/msvc/AcpiBinDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiBinDebug"
+# PROP Output_Dir "AcpiBinDebug"
+# PROP Intermediate_Dir "AcpiBinDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_BIN_APP" /FR /FD /GZ /c
+# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_BIN_APP" /D "__STDC__" /FR /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

@@ -81,12 +81,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiBinDebug/AcpiBin.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiBinDebug/AcpiBin.exe"
+# ADD LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PostBuild_Desc=Copy AcpiBinDebug.exe to libraries
-PostBuild_Cmds=copy acpibindebug\acpibin.exe ..\..\libraries\AcpiBinDebug.exe	dir ..\..\libraries\acpibindebug.exe
+PostBuild_Cmds=copy acpibindebug\acpibin.exe ..\..\libraries\AcpiBinDebug.exe
 # End Special Build Tool
 
 !ENDIF

@@ -139,6 +139,14 @@ SOURCE=..\..\source\components\utilities\utdebug.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utdecode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utexcep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utglobal.c
 # End Source File
 # Begin Source File

@@ -163,6 +171,10 @@ SOURCE=..\..\source\components\utilities\utstate.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utxferror.c
 # End Source File
 # End Group

generate/msvc/AcpiCA.dsw new file +101 -0

101 lines not on this page · raw message

generate/msvc/AcpiExec.dsp +108 -8

248 lines not on this page · raw message

generate/msvc/AcpiNames.dsp +46 -6

116 lines not on this page · raw message

generate/msvc/AcpiSrc.dsp +10 ~~-10~~

index a1976b5..7ff619f 100755
@@ -37,12 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrc"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrc"
+# PROP Output_Dir "AcpiSrc"
+# PROP Intermediate_Dir "AcpiSrc"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\Include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /FR /FD /c
+# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\Include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /D "__STDC__" /FR /FD /c
 # SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -51,14 +51,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /machine:I386
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking existence of acpi/libraries directory
 PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries
 PostBuild_Desc=Copy acpisrc.exe to libraries
-PostBuild_Cmds=copy acpisrc\acpisrc.exe ..\..\libraries	dir ..\..\libraries\acpisrc.exe
+PostBuild_Cmds=copy acpisrc\acpisrc.exe ..\..\libraries
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "AcpiSrc - Win32 Debug"

@@ -70,12 +70,12 @@ PostBuild_Cmds=copy acpisrc\acpisrc.exe ..\..\libraries	dir ..\..\libraries\acpi
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrcDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrcDebug"
+# PROP Output_Dir "AcpiSrcDebug"
+# PROP Intermediate_Dir "AcpiSrcDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\Include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /FR /FD /GZ /c
+# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\Include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /D "__STDC__" /FR /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

@@ -83,14 +83,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiSrcDebug/AcpiSrc.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiSrcDebug/AcpiSrc.exe"
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking existence of acpi/components/libraries directory
 PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries
 PostBuild_Desc=Copy acpisrcdebug.exe to libraries
-PostBuild_Cmds=copy acpisrcdebug\acpisrc.exe ..\..\libraries\acpisrcdebug.exe	dir ..\..\libraries\acpisrcdebug.exe
+PostBuild_Cmds=copy acpisrcdebug\acpisrc.exe ..\..\libraries\acpisrcdebug.exe
 # End Special Build Tool
 
 !ENDIF

generate/msvc/AcpiSrc_Linux.dsp +7 -6

index cb0a657..74658f4 100755
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrcLinux"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrcLinux"
+# PROP Output_Dir "AcpiSrcLinux"
+# PROP Intermediate_Dir "AcpiSrcLinux"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiSrcLinux/AcpiSrcLinux.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /machine:I386
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking existence of acpi/libraries directory

@@ -69,8 +69,8 @@ PostBuild_Cmds=copy AcpiSrcLinux\AcpiSrcLinux.exe ..\..\libraries	dir ..\..\libr
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrcLinuxDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrcLinuxDebug"
+# PROP Output_Dir "AcpiSrcLinuxDebug"
+# PROP Intermediate_Dir "AcpiSrcLinuxDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

@@ -83,7 +83,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrc_LinuxDebug.bsc" /o"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrcLinux.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrc_LinuxDebug.exe" /out:"/acpica/generate/msvc/AcpiSrcLinuxDebug\AcpiSrcLinuxDebug.exe"
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrc_LinuxDebug.exe"
+# SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking existence of acpi/components/libraries directory

generate/msvc/AcpiSubsystem.dsp +38 -7

92 lines not on this page · raw message

generate/msvc/AcpiXtract.dsp +24 -8

index 305b881..cebefd7 100755
@@ -37,12 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiXtract"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiXtract"
+# PROP Output_Dir "AcpiXtract"
+# PROP Intermediate_Dir "AcpiXtract"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
+# ADD CPP /nologo /Za /W4 /O2 /I "../../source/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"

@@ -68,12 +68,12 @@ PostBuild_Cmds=copy AcpiXtract\AcpiXtract.exe ..\..\libraries
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "/acpica/generate/msvc/AcpiXtractDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiXtractDebug"
+# PROP Output_Dir "AcpiXtractDebug"
+# PROP Intermediate_Dir "AcpiXtractDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Za /W4 /Zi /Od /Gf /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# ADD CPP /nologo /Za /W4 /Zi /Od /Gf /I "../../source/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiXtractDebug/AcpiXtract.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiXtractDebug/AcpiXtract.exe"
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"

@@ -98,6 +98,9 @@ PostBuild_Cmds=copy AcpiXtractDebug\AcpiXtract.exe ..\..\libraries\AcpiXtractDeb
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "AcpiXtract"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\..\source\tools\AcpiXtract\acpixtract.c

@@ -113,6 +116,19 @@ SOURCE=..\..\source\tools\AcpiXtract\acpixtract.c
 !ENDIF 
 
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\tools\acpixtract\axmain.c
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\source\common\getopt.c
+# End Source File
+# End Group
 # End Group
 # Begin Group "Header Files"

generate/msvc/AslCompiler.dsp +282 ~~-78~~

563 lines not on this page · raw message

source/compiler/aslcompiler.y +0 -1

index 7191e85..2ed10c1 100644
@@ -141,7 +141,6 @@ void *                      AslLocalAllocate (unsigned int Size);
 
 /* Bison/yacc configuration */
 
-#define static
 #undef alloca
 #define alloca              AslLocalAllocate
 #define yytname             AslCompilername

source/compiler/dtparser.y +7 -0

index c400549..46ef7b2 100644
@@ -120,6 +120,13 @@
 #define _COMPONENT          DT_COMPILER
         ACPI_MODULE_NAME    ("dtparser")
 
+void *                      AslLocalAllocate (unsigned int Size);
+
+/* Bison/yacc configuration */
+
+#undef alloca
+#define alloca              AslLocalAllocate
+
 int                         DtParserlex (void);
 int                         DtParserparse (void);
 void                        DtParsererror (char const *msg);

source/compiler/prparser.y +7 -0

index 2b19713..c2f2150 100644
@@ -120,6 +120,13 @@
 #define _COMPONENT          ASL_PREPROCESSOR
         ACPI_MODULE_NAME    ("prparser")
 
+void *                      AslLocalAllocate (unsigned int Size);
+
+/* Bison/yacc configuration */
+
+#undef alloca
+#define alloca              AslLocalAllocate
+
 int                         PrParserlex (void);
 int                         PrParserparse (void);
 void                        PrParsererror (char const *msg);

Signature · 1 line

1.7.10

Moore

2013-01-15 19:46 UTC #3 lore raw

Re: [Devel] [PATCH 2/2] Update MSVC project/workspace files.

Lv,

The files under generate/msvc were used for MS VC 6.0, and are now "fully" deprecated (and probably should now be deleted, since we don't want to support them.)

Use generate/msvc9

Bob

Quoted 1,828 lines

-----Original Message-----
From: Zheng, Lv
Sent: Sunday, January 13, 2013 4:36 PM
To: Moore, Robert
Cc: Rafael J Wysocki; Brown, Len; Huang, Ying; devel(a)acpica.org; Zheng, Lv
Subject: [PATCH 2/2] Update MSVC project/workspace files.
This patch updates MSVC build files to make windows build working. Following fixes have been done to the MSVC files:
1. Add missing .c files into .dsp.
2. Convert abstract paths in .dsp into relative paths.
3. Add AcpiCA.dsw to collect non-Linux projects.
4. Update .dsp, compiling .y/.l using standard GNU flex/bison.
5. Fix link issues in .y.
Signed-off-by Lv Zheng <lv.zheng(a)intel.com>
---
 generate/msvc/AcpiBin.dsp       |   32 ++--
 generate/msvc/AcpiCA.dsw        |  101 +++++++++++
 generate/msvc/AcpiExec.dsp      |  116 ++++++++++++-
 generate/msvc/AcpiNames.dsp     |   52 +++++-
 generate/msvc/AcpiSrc.dsp       |   20 +--
 generate/msvc/AcpiSrc_Linux.dsp |   13 +-
 generate/msvc/AcpiSubsystem.dsp |   45 ++++-
 generate/msvc/AcpiXtract.dsp    |   32 +++-
 generate/msvc/AslCompiler.dsp   |  360 ++++++++++++++++++++++++++++++----
-----
 source/compiler/aslcompiler.y   |    1 -
 source/compiler/dtparser.y      |    7 +
 source/compiler/prparser.y      |    7 +
 12 files changed, 652 insertions(+), 134 deletions(-)
 create mode 100644 generate/msvc/AcpiCA.dsw
generate/msvc/AcpiBin.dsp +2 -2
index cbbb5c5..4cb4770 100755
@@ -37,12 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiBin"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiBin"
+# PROP Output_Dir "AcpiBin"
+# PROP Intermediate_Dir "AcpiBin"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\include" /D "NDEBUG" /D "ACPI_BIN_APP" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /c +# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_BIN_APP" /D "__STDC__" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
generate/msvc/AcpiBin.dsp +0 -0
@@ -51,12 +51,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"advapi32.lib" +# ADD LINK32 kernel32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"advapi32.lib"
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Desc=Copy AcpiBin.exe to libraries
-PostBuild_Cmds=copy acpibin\acpibin.exe ..\..\libraries dir
..\..\libraries\acpibin.exe
generate/msvc/AcpiBin.dsp +1 -0
+PostBuild_Cmds=copy acpibin\acpibin.exe ..\..\libraries
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "AcpiBin - Win32 Debug"
@@ -68,12 +68,12 @@ PostBuild_Cmds=copy acpibin\acpibin.exe
..\..\libraries dir ..\..\libraries\acpi
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiBin.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiBinDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiBinDebug"
+# PROP Output_Dir "AcpiBinDebug"
+# PROP Intermediate_Dir "AcpiBinDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_BIN_APP" /FR /FD /GZ /c
+# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_BIN_APP" /D "__STDC__" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
generate/msvc/AcpiBin.dsp +0 -0
@@ -81,12 +81,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiBinDebug/AcpiBin.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiBinDebug/AcpiBin.exe" +# ADD LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Desc=Copy AcpiBinDebug.exe to libraries
-PostBuild_Cmds=copy acpibindebug\acpibin.exe
..\..\libraries\AcpiBinDebug.exe dir ..\..\libraries\acpibindebug.exe
+PostBuild_Cmds=copy acpibindebug\acpibin.exe ..\..\libraries\AcpiBinDebug.exe
# End Special Build Tool
!ENDIF
generate/msvc/AcpiBin.dsp +12 -0
@@ -139,6 +139,14 @@ SOURCE=..\..\source\components\utilities\utdebug.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utdecode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utexcep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utglobal.c
 # End Source File
 # Begin Source File
@@ -163,6 +171,10 @@ SOURCE=..\..\source\components\utilities\utstate.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utxferror.c
 # End Source File
 # End Group
generate/msvc/AcpiCA.dsw new file +4 -0
new file mode 100644
index 0000000..fc6d2d3
@@ -0,0 +1,101 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiBin"=.\AcpiBin.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiExec"=.\AcpiExec.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiNames"=.\AcpiNames.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiSrc"=.\AcpiSrc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiSubsystem"=.\AcpiSubsystem.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiXtract"=.\AcpiXtract.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AslCompiler"=.\AslCompiler.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +1 -0
+
generate/msvc/AcpiExec.dsp +2 -2
index c306f8d..faa42dc 100755
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiExec"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiExec"
+# PROP Output_Dir "AcpiExec"
+# PROP Intermediate_Dir "AcpiExec"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /YX /FD /c
generate/msvc/AcpiExec.dsp +0 -0
@@ -51,14 +51,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking existence of acpi/libraries directory PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy acpiexec.exe to libraries
-PostBuild_Cmds=copy acpiexec\acpiexec.exe ..\..\libraries dir
..\..\libraries\acpiexec.exe
generate/msvc/AcpiExec.dsp +1 -0
+PostBuild_Cmds=copy acpiexec\acpiexec.exe ..\..\libraries
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "AcpiExec - Win32 Debug"
@@ -70,8 +70,8 @@ PostBuild_Cmds=copy acpiexec\acpiexec.exe
..\..\libraries dir ..\..\libraries\ac
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiExec.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiExecDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiExecDebug"
+# PROP Output_Dir "AcpiExecDebug"
+# PROP Intermediate_Dir "AcpiExecDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
generate/msvc/AcpiExec.dsp +0 -0
@@ -83,14 +83,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiExecDebug/AcpiExec.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libcmtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /nodefaultlib:"libcmt.lib" /pdbtype:sept /out:"/acpica/generate/msvc/AcpiExecDebug/AcpiExec.exe"
+# ADD LINK32 libcmtd.lib kernel32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /nodefaultlib:"libcmt.lib" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking existence of acpi/libraries directory PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy acpiexecdebug.exe to libraries
-PostBuild_Cmds=copy acpiexecdebug\acpiexec.exe
..\..\libraries\acpiexecdebug.exe dir ..\..\libraries\acpiexecdebug.exe
+PostBuild_Cmds=copy acpiexecdebug\acpiexec.exe ..\..\libraries\acpiexecdebug.exe
# End Special Build Tool
!ENDIF
generate/msvc/AcpiExec.dsp +0 -0
@@ -107,6 +107,34 @@ PostBuild_Cmds=copy acpiexecdebug\acpiexec.exe
..\..\libraries\acpiexecdebug.exe
# PROP Default_Filter ".c"
# Begin Source File
generate/msvc/AcpiExec.dsp +80 -0
+SOURCE=..\..\source\components\debugger\dbconvert.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\events\evhandler.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\namespace\nsprepkg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psopinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\resources\rsdumpinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utaddress.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utalloc.c
 # End Source File
 # Begin Source File
@@ -123,6 +151,10 @@ SOURCE=..\..\source\components\utilities\utdebug.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utdecode.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utdelete.c
 # End Source File
 # Begin Source File
@@ -131,6 +163,10 @@ SOURCE=..\..\source\components\utilities\uteval.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utexcep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utglobal.c
 # End Source File
 # Begin Source File
@@ -177,6 +213,10 @@ SOURCE=..\..\source\components\utilities\utosi.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utownerid.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utresrc.c
 # End Source File
 # Begin Source File
@@ -185,6 +225,10 @@ SOURCE=..\..\source\components\utilities\utstate.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\uttrack.c
 # End Source File
 # Begin Source File
@@ -195,6 +239,14 @@ SOURCE=..\..\source\components\utilities\utxface.c
 
 SOURCE=..\..\source\components\utilities\utxferror.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utxfinit.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utxfmutex.c
+# End Source File
 # End Group
 # Begin Group "Namespace"
 
@@ -285,6 +337,10 @@ SOURCE=..\..\source\components\hardware\hwacpi.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\hardware\hwesleep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\hardware\hwgpe.c
 # End Source File
 # Begin Source File
@@ -307,6 +363,10 @@ SOURCE=..\..\source\components\hardware\hwvalid.c
 
 SOURCE=..\..\source\components\hardware\hwxface.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\hardware\hwxfsleep.c
+# End Source File
 # End Group
 # Begin Group "Events"
 
@@ -317,6 +377,10 @@ SOURCE=..\..\source\components\events\evevent.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\events\evglock.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\EVENTS\evgpe.c
 # End Source File
 # Begin Source File
@@ -425,6 +489,14 @@ SOURCE=..\..\source\COMPONENTS\DEBUGGER\dbinput.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\debugger\dbmethod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\debugger\dbnames.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\DEBUGGER\dbstats.c
 # End Source File
 # Begin Source File
@@ -461,6 +533,10 @@ SOURCE=..\..\source\components\tables\tbxface.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\tables\tbxfload.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\tables\tbxfroot.c
 # End Source File
 # End Group
@@ -526,6 +602,10 @@ SOURCE=..\..\source\components\resources\rsmisc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\resources\rsserial.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\resources\rsutils.c
 # End Source File
 # Begin Source File
@@ -542,6 +622,10 @@
SOURCE=..\..\source\COMPONENTS\Disassembler\dmbuffer.c
# End Source File
# Begin Source File
generate/msvc/AcpiExec.dsp +4 -0
+SOURCE=..\..\source\components\disassembler\dmdeferred.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\Disassembler\dmnames.c
 # End Source File
 # Begin Source File
@@ -562,6 +646,10 @@
SOURCE=..\..\source\COMPONENTS\Disassembler\dmresrcl.c
# End Source File
# Begin Source File
generate/msvc/AcpiExec.dsp +16 -0
+SOURCE=..\..\source\components\disassembler\dmresrcl2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\Disassembler\dmresrcs.c
 # End Source File
 # Begin Source File
@@ -718,6 +806,14 @@ SOURCE=..\..\source\components\parser\psxface.c
 # PROP Default_Filter ".c"
 # Begin Source File
 
+SOURCE=..\..\source\components\dispatcher\dsargs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\dispatcher\dscontrol.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\dispatcher\dsfield.c
 # End Source File
 # Begin Source File
@@ -754,6 +850,10 @@ SOURCE=..\..\source\components\dispatcher\dswload.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\dispatcher\dswload2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\dispatcher\dswscope.c
 # End Source File
 # Begin Source File
generate/msvc/AcpiNames.dsp +2 -2
index 3fa41de..1a8d630 100755
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiNames"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiNames"
+# PROP Output_Dir "AcpiNames"
+# PROP Intermediate_Dir "AcpiNames"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /YX /FD /c
generate/msvc/AcpiNames.dsp +0 -0
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /machine:I386
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Cmds=copy AcpiNames\AcpiNames.exe ..\..\libraries
generate/msvc/AcpiNames.dsp +0 -0
@@ -66,8 +66,8 @@ PostBuild_Cmds=copy AcpiNames\AcpiNames.exe
..\..\libraries
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiNames.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiNamesDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiNamesDebug"
+# PROP Output_Dir "AcpiNamesDebug"
+# PROP Intermediate_Dir "AcpiNamesDebug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /Gr /Za /W4 /Gm /Gi /GX /ZI /Od /I
"..\..\source\Include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_APPLICATION" /D "ACPI_SINGLE_THREADED" /D "ACPI_DEBUGGER" /FR /FD /GZ /c
generate/msvc/AcpiNames.dsp +0 -0
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Cmds=copy AcpiNamesdebug\AcpiNames.exe
..\..\libraries\AcpiNamesdebug.exe
generate/msvc/AcpiNames.dsp +0 -0
@@ -112,6 +112,10 @@
SOURCE=..\..\source\os_specific\service_layers\oswinxf.c
# PROP Default_Filter ""
# Begin Source File
generate/msvc/AcpiNames.dsp +40 -0
+SOURCE=..\..\source\components\utilities\utaddress.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utalloc.c
 # End Source File
 # Begin Source File
@@ -120,10 +124,18 @@ SOURCE=..\..\source\components\utilities\utcache.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utdecode.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utdelete.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utexcep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utglobal.c
 # End Source File
 # Begin Source File
@@ -172,6 +184,10 @@ SOURCE=..\..\source\components\utilities\utxface.c
 
 SOURCE=..\..\source\components\utilities\utxferror.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utxfinit.c
+# End Source File
 # End Group
 # Begin Group "Tables"
 
@@ -198,6 +214,10 @@ SOURCE=..\..\source\components\tables\tbxface.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\tables\tbxfload.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\tables\tbxfroot.c
 # End Source File
 # End Group
@@ -334,6 +354,10 @@ SOURCE=..\..\source\components\dispatcher\dswload.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\dispatcher\dswload2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\dispatcher\dswscope.c
 # End Source File
 # Begin Source File
@@ -377,6 +401,22 @@ SOURCE=..\..\source\tools\AcpiNames\anstubs.c
 
 SOURCE=..\..\source\tools\AcpiNames\antables.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psopinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utownerid.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
generate/msvc/AcpiSrc.dsp +2 -2
index a1976b5..7ff619f 100755
@@ -37,12 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrc"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrc"
+# PROP Output_Dir "AcpiSrc"
+# PROP Intermediate_Dir "AcpiSrc"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\Include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /FR /FD /c
+# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\Include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /D "__STDC__" /FR /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
generate/msvc/AcpiSrc.dsp +0 -0
@@ -51,14 +51,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /machine:I386
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking existence of acpi/libraries directory PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy acpisrc.exe to libraries
-PostBuild_Cmds=copy acpisrc\acpisrc.exe ..\..\libraries dir
..\..\libraries\acpisrc.exe
generate/msvc/AcpiSrc.dsp +1 -0
+PostBuild_Cmds=copy acpisrc\acpisrc.exe ..\..\libraries
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "AcpiSrc - Win32 Debug"
@@ -70,12 +70,12 @@ PostBuild_Cmds=copy acpisrc\acpisrc.exe
..\..\libraries dir ..\..\libraries\acpi
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiSrc.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrcDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrcDebug"
+# PROP Output_Dir "AcpiSrcDebug"
+# PROP Intermediate_Dir "AcpiSrcDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\Include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /FR /FD /GZ /c
+# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\Include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /D "__STDC__" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
generate/msvc/AcpiSrc.dsp +0 -0
@@ -83,14 +83,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiSrcDebug/AcpiSrc.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiSrcDebug/AcpiSrc.exe"
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking existence of acpi/components/libraries directory PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy acpisrcdebug.exe to libraries
-PostBuild_Cmds=copy acpisrcdebug\acpisrc.exe
..\..\libraries\acpisrcdebug.exe dir ..\..\libraries\acpisrcdebug.exe
+PostBuild_Cmds=copy acpisrcdebug\acpisrc.exe ..\..\libraries\acpisrcdebug.exe
# End Special Build Tool
!ENDIF
generate/msvc/AcpiSrc_Linux.dsp +2 -2
index cb0a657..74658f4 100755
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrcLinux"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrcLinux"
+# PROP Output_Dir "AcpiSrcLinux"
+# PROP Intermediate_Dir "AcpiSrcLinux"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /Yu"stdafx.h" /FD /c
generate/msvc/AcpiSrc_Linux.dsp +0 -0
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
/o"/acpica/generate/msvc/AcpiSrcLinux/AcpiSrcLinux.bsc"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /machine:I386
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking existence of acpi/libraries directory
generate/msvc/AcpiSrc_Linux.dsp +0 -0
@@ -69,8 +69,8 @@ PostBuild_Cmds=copy AcpiSrcLinux\AcpiSrcLinux.exe
..\..\libraries dir ..\..\libr
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiSrc_Linux.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrcLinuxDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrcLinuxDebug"
+# PROP Output_Dir "AcpiSrcLinuxDebug"
+# PROP Intermediate_Dir "AcpiSrcLinuxDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
generate/msvc/AcpiSrc_Linux.dsp +0 -0
@@ -83,7 +83,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
/o"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrc_LinuxDebug.bsc" /o"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrcLinux.bsc"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrc_LinuxDebug.exe" /out:"/acpica/generate/msvc/AcpiSrcLinuxDebug\AcpiSrcLinuxDebug.exe" +# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrc_LinuxDebug.exe"
generate/msvc/AcpiSrc_Linux.dsp +1 -0
+# SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking existence of acpi/components/libraries directory
generate/msvc/AcpiSubsystem.dsp +2 -2
index 4b574d4..e440056 100755
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSubsystem"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSubsystem"
+# PROP Output_Dir "AcpiSubsystem"
+# PROP Intermediate_Dir "AcpiSubsystem"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D
"_LIB" /YX /FD /c
# ADD CPP /nologo /Gr /MT /Za /W4 /O1 /I "..\..\source\Include" /D
"ACPI_LIBRARY" /D "NDEBUG" /D "_GEN" /D "DRIVER" /D "_WINDOWS" /D PROCESSOR_ARCHITECTURE=x86 /D "WIN32" /FR /FD /c
generate/msvc/AcpiSubsystem.dsp +0 -1
@@ -50,7 +50,6 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /out:"/acpica/generate/msvc/AcpiSubsystem\AcpiSubsystem.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking existence of acpi/libraries directory
@@ -68,8 +67,8 @@ PostBuild_Cmds=copy AcpiSubsystem\acpisubsystem.lib
..\..\libraries\acpica.lib d
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiSubsystem.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSubsystemDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSubsystemDebug"
+# PROP Output_Dir "AcpiSubsystemDebug"
+# PROP Intermediate_Dir "AcpiSubsystemDebug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS"
/D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /Gr /MTd /Za /W4 /Zi /Oa /Og /Os /Oy /Gf /I
"..\..\source\Include" /D "ACPI_LIBRARY" /D "ACPI_FULL_DEBUG" /D "_WINDOWS" /D PROCESSOR_ARCHITECTURE=x86 /D "WIN32" /FR /FD /c
generate/msvc/AcpiSubsystem.dsp +0 -0
@@ -80,13 +79,13 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
/o"/acpica/generate/msvc/AcpiSubsystemDebug/AcpiSubsystem.bsc"
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"/acpica/generate/msvc/AcpiSubsystemDebug\AcpiSubsystem.lib"
generate/msvc/AcpiSubsystem.dsp +1 -1
+# ADD LIB32 /nologo
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking existence of acpi/libraries directory
 PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries
 PostBuild_Desc=Copy library to libraries
-PostBuild_Cmds=copy AcpiSubsystemDebug\acpisubsystem.lib
..\..\libraries\acpica_dbg.lib dir ..\..\libraries\acpica_dbg.lib
+PostBuild_Cmds=copy AcpiSubsystemDebug\acpisubsystem.lib ..\..\libraries\acpica_dbg.lib
# End Special Build Tool
!ENDIF
generate/msvc/AcpiSubsystem.dsp +0 -0
@@ -103,6 +102,30 @@ PostBuild_Cmds=copy
AcpiSubsystemDebug\acpisubsystem.lib ..\..\libraries\acpica_
# PROP Default_Filter ".c"
# Begin Source File
generate/msvc/AcpiSubsystem.dsp +32 -0
+SOURCE=..\..\source\components\debugger\dbconvert.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\events\evhandler.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\namespace\nsprepkg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psopinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\resources\rsdumpinfo.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utalloc.c
 # End Source File
 # Begin Source File
@@ -168,6 +191,10 @@ SOURCE=..\..\source\components\utilities\utosi.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utownerid.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utresrc.c
 # End Source File
 # Begin Source File
@@ -176,6 +203,10 @@ SOURCE=..\..\source\components\utilities\utstate.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utxface.c
 # End Source File
 # Begin Source File
generate/msvc/AcpiXtract.dsp +2 -2
index 305b881..cebefd7 100755
@@ -37,12 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiXtract"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiXtract"
+# PROP Output_Dir "AcpiXtract"
+# PROP Intermediate_Dir "AcpiXtract"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
+# ADD CPP /nologo /Za /W4 /O2 /I "../../source/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
generate/msvc/AcpiXtract.dsp +0 -0
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
generate/msvc/AcpiXtract.dsp +0 -0
@@ -68,12 +68,12 @@ PostBuild_Cmds=copy AcpiXtract\AcpiXtract.exe
..\..\libraries
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiXtract.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiXtractDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiXtractDebug"
+# PROP Output_Dir "AcpiXtractDebug"
+# PROP Intermediate_Dir "AcpiXtractDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Za /W4 /Zi /Od /Gf /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# ADD CPP /nologo /Za /W4 /Zi /Od /Gf /I "../../source/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
generate/msvc/AcpiXtract.dsp +0 -0
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
/o"/acpica/generate/msvc/AcpiXtractDebug/AcpiXtract.bsc"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiXtractDebug/AcpiXtract.exe" +# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
generate/msvc/AcpiXtract.dsp +0 -0
@@ -98,6 +98,9 @@ PostBuild_Cmds=copy AcpiXtractDebug\AcpiXtract.exe
..\..\libraries\AcpiXtractDeb
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
generate/msvc/AcpiXtract.dsp +16 -0
+# Begin Group "AcpiXtract"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\..\source\tools\AcpiXtract\acpixtract.c
@@ -113,6 +116,19 @@ SOURCE=..\..\source\tools\AcpiXtract\acpixtract.c
 !ENDIF
 
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\tools\acpixtract\axmain.c
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\source\common\getopt.c
+# End Source File
+# End Group
 # End Group
 # Begin Group "Header Files"
 
generate/msvc/AslCompiler.dsp +2 -2
index c4d074c..0756517 100755
@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AslCompiler"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AslCompiler"
+# PROP Output_Dir "AslCompiler"
+# PROP Intermediate_Dir "AslCompiler"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "_AFXDLL" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /O2 /I "$(OutDir)..\\" /I "..\..\source\Include" /I "$(OutDir)" /I "..\..\source\compiler" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "YY_NEVER_INTERACTIVE" /D "ACPI_ASL_COMPILER" /FR /FD /c
+# ADD CPP /nologo /MT /Za /W4 /O2 /I "..\..\source\Include" /I "..\..\source\compiler" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "YY_NEVER_INTERACTIVE" /D "ACPI_ASL_COMPILER" /FR /FD /c
# SUBTRACT CPP /X /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
generate/msvc/AslCompiler.dsp +0 -1
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AslCompiler/AslCompiler.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 ..\..\tools_3rd_party\BisonFlex\libflex.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /machine:I386 /pdb:"/acpica/generate/msvc/AslCompiler/AslCompiler.pdb" /out:"/acpica/generate/msvc/AslCompiler/AslCompiler.exe" /pdb:"/acpica/generate/msvc/AslCompiler/AslCompiler.pdb"
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /machine:I386 /pdb:"/acpica/generate/msvc/AslCompiler/AslCompiler.pdb" /out:"/acpica/generate/msvc/AslCompiler/AslCompiler.exe" /pdb:"/acpica/generate/msvc/AslCompiler/AslCompiler.pdb"
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy iasl.exe to libraries directory
-PostBuild_Cmds=copy AslCompiler\aslcompiler.exe
\acpica\Libraries\iasl.exe dir \acpica\libraries\iasl.exe
generate/msvc/AslCompiler.dsp +3 -2
+PostBuild_Cmds=copy AslCompiler\aslcompiler.exe ..\..\libraries\iasl.exe
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
@@ -71,12 +71,12 @@ PostBuild_Cmds=copy AslCompiler\aslcompiler.exe
 \acpica\Libraries\iasl.exe	dir \
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "/acpica/generate/msvc/AslCompilerDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AslCompilerDebug"
+# PROP Output_Dir "AslCompilerDebug"
+# PROP Intermediate_Dir "AslCompilerDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_AFXDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /Za /W4 /Gi /Zi /Ot /Oa /Oy /Gf /I "$(OutDir)..\\" /I "..\..\source\Include" /I "$(OutDir)" /I "..\..\source\compiler" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "YY_NEVER_INTERACTIVE" /D "ACPI_ASL_COMPILER" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /Za /W4 /Gi /Zi /Ot /Oa /Oy /Gf /I "..\..\source\Include" /I "..\..\source\compiler" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "YY_NEVER_INTERACTIVE" /D "ACPI_ASL_COMPILER" /FR /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
generate/msvc/AslCompiler.dsp +0 -0
@@ -86,12 +86,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
/o"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.bsc"
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386
/pdbtype:sept
-# ADD LINK32 ..\..\tools_3rd_party\BisonFlex\libflex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /incremental:no /debug /machine:I386 /nodefaultlib:"libcmt.lib" /pdbtype:sept /pdb:"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.pdb" /out:"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.exe" /pdb:"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.pdb" /map:"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.map" +# ADD LINK32 kernel32.lib advapi32.lib /nologo /pdb:none /debug /machine:I386 /nodefaultlib:"libcmt.lib" /pdb:"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.pdb"
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy iasldebug.exe to libraries directory
-PostBuild_Cmds=copy AslCompilerDebug\aslcompiler.exe
\acpica\Libraries\iasldebug.exe dir \acpica\libraries\iasldebug.exe
+PostBuild_Cmds=copy AslCompilerDebug\aslcompiler.exe ..\..\\libraries\iasldebug.exe
# End Special Build Tool
!ENDIF
generate/msvc/AslCompiler.dsp +0 -0
@@ -108,6 +108,10 @@ PostBuild_Cmds=copy AslCompilerDebug\aslcompiler.exe
\acpica\Libraries\iasldebug
# PROP Default_Filter ".c"
# Begin Source File
generate/msvc/AslCompiler.dsp +80 -0
+SOURCE=..\..\source\components\utilities\utaddress.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utalloc.c
 # End Source File
 # Begin Source File
@@ -124,10 +128,18 @@ SOURCE=..\..\source\components\utilities\utdebug.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utdecode.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utdelete.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utexcep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utglobal.c
 # End Source File
 # Begin Source File
@@ -156,6 +168,10 @@ SOURCE=..\..\source\components\utilities\utobject.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utownerid.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utresrc.c
 # End Source File
 # Begin Source File
@@ -164,6 +180,10 @@ SOURCE=..\..\source\components\utilities\utstate.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utxface.c
 # End Source File
 # Begin Source File
@@ -224,6 +244,10 @@ SOURCE=..\..\source\compiler\aslanalyze.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\compiler\aslbtypes.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\compiler\aslcodegen.c
 # End Source File
 # Begin Source File
@@ -236,6 +260,10 @@ SOURCE=..\..\source\compiler\aslerror.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\compiler\aslfileio.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\compiler\aslfiles.c
 # End Source File
 # Begin Source File
@@ -244,6 +272,10 @@ SOURCE=..\..\source\compiler\aslfold.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\compiler\aslhex.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\compiler\asllength.c
 # End Source File
 # Begin Source File
@@ -268,6 +300,14 @@ SOURCE=..\..\source\compiler\aslmap.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\compiler\aslmethod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\aslnamesp.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\compiler\aslopcodes.c
 # End Source File
 # Begin Source File
@@ -312,6 +352,10 @@ SOURCE=..\..\source\compiler\aslrestype2q.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\compiler\aslrestype2s.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\compiler\aslrestype2w.c
 # End Source File
 # Begin Source File
@@ -334,6 +378,38 @@ SOURCE=..\..\source\compiler\asltree.c
 
 SOURCE=..\..\source\compiler\aslutils.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\asluuid.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\aslwalks.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\aslxref.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\dtexpress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prexpress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prmacros.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prscan.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prutils.c
+# End Source File
 # End Group
 # Begin Group "Common"
 
@@ -352,6 +428,10 @@ SOURCE=..\..\source\common\adwalk.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\common\ahpredef.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\common\dmextern.c
 # End Source File
 # Begin Source File
@@ -394,67 +474,27 @@
SOURCE=..\..\source\os_specific\service_layers\oswinxf.c
# PROP Default_Filter "*.c, *.h"
# Begin Source File
generate/msvc/AslCompiler.dsp +10 ~~-50~~
-SOURCE=.\AslCompiler\AslCompiler.l.c
-
-!IF  "$(CFG)" == "AslCompiler - Win32 Release"
-
-# ADD CPP /W3
-
-!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-# ADD CPP /W3
-
-!ENDIF
-
+SOURCE=.\aslcompiler.l.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\AslCompiler\AslCompiler.y.c
-
-!IF  "$(CFG)" == "AslCompiler - Win32 Release"
-
-# ADD CPP /W3
-
-!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-# ADD CPP /W3
-
-!ENDIF
-
+SOURCE=.\aslcompiler.y.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\AslCompilerDebug\AslCompilerDebug.l.c
-
-!IF  "$(CFG)" == "AslCompiler - Win32 Release"
-
-# PROP Exclude_From_Build 1
-# ADD CPP /W3
-
-!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
-
-# ADD CPP /W3
-
-!ENDIF
-
+SOURCE=.\dtparser.l.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\AslCompilerDebug\AslCompilerDebug.y.c
-
-!IF  "$(CFG)" == "AslCompiler - Win32 Release"
-
-# PROP Exclude_From_Build 1
-# ADD CPP /W3
-
-!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
-
-# ADD CPP /W3
+SOURCE=.\dtparser.y.c
+# End Source File
+# Begin Source File
 
-!ENDIF
+SOURCE=.\prparser.l.c
+# End Source File
+# Begin Source File
 
+SOURCE=.\prparser.y.c
 # End Source File
 # End Group
 # Begin Group "Disassembler"
@@ -470,6 +510,10 @@
SOURCE=..\..\source\COMPONENTS\disassembler\dmbuffer.c
# End Source File
# Begin Source File
generate/msvc/AslCompiler.dsp +4 -0
+SOURCE=..\..\source\components\disassembler\dmdeferred.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\disassembler\dmnames.c
 # End Source File
 # Begin Source File
@@ -490,6 +534,10 @@
SOURCE=..\..\source\COMPONENTS\disassembler\dmresrcl.c
# End Source File
# Begin Source File
generate/msvc/AslCompiler.dsp +24 -1
+SOURCE=..\..\source\components\disassembler\dmresrcl2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\disassembler\dmresrcs.c
 # End Source File
 # Begin Source File
@@ -618,10 +666,18 @@ SOURCE=..\..\source\components\parser\psloop.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\parser\psobject.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\parser\psopcode.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\parser\psopinfo.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\parser\psparse.c
 # End Source File
 # Begin Source File
@@ -646,6 +702,14 @@ SOURCE=..\..\source\components\parser\pswalk.c
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\source\components\dispatcher\dsargs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\dispatcher\dscontrol.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\dispatcher\dsfield.c
 # End Source File
 # Begin Source File
@@ -670,6 +734,10 @@ SOURCE=..\..\source\components\dispatcher\dswload.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\dispatcher\dswload2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\dispatcher\dswscope.c
 # End Source File
 # Begin Source File
@@ -753,25 +821,24 @@ SOURCE=../../source/compiler/aslcompiler.l
 !IF  "$(CFG)" == "AslCompiler - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Building iASL Lexer  from $(InputPath) to
AslCompiler/$(InputName).l.c
generate/msvc/AslCompiler.dsp +1 -3
-ProjDir=.
+# Begin Custom Build - Lexing $(InputPath)...
 InputPath=../../source/compiler/aslcompiler.l
 InputName=aslcompiler
 
-"AslCompiler/$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\Tools_3rd_party\BisonFlex\flex.exe -PAslCompiler -i -s -
o$(ProjDir)/AslCompiler/$(InputName).l.c $(InputPath) +"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
generate/msvc/AslCompiler.dsp +1 -1
+	flex -PAslCompiler -o$(InputName).l.c $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Building iASL Lexer  from $(InputPath) to
AslCompilerDebug/$(InputName)Debug.l.c
+# Begin Custom Build - Lexing $(InputPath)...
InputPath=../../source/compiler/aslcompiler.l
InputName=aslcompiler
-"AslCompilerDebug/$(InputName)Debug.l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
generate/msvc/AslCompiler.dsp +0 -1
-	..\..\Tools_3rd_party\BisonFlex\flex.exe -PAslCompiler -i -s -
oAslCompilerDebug/$(InputName)Debug.l.c $(InputPath) +"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
generate/msvc/AslCompiler.dsp +1 -1
+	flex -PAslCompiler -o$(InputName).l.c $(InputPath)
 
 # End Custom Build
@@ -785,37 +852,174 @@ SOURCE=../../source/compiler/aslcompiler.y
 !IF  "$(CFG)" == "AslCompiler - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Building iASL Parser from $(InputPath) to
AslCompiler/$(InputName).y.c
generate/msvc/AslCompiler.dsp +4 -6
-ProjDir=.
+# Begin Custom Build - Yaccing $(InputPath)...
 InputPath=../../source/compiler/aslcompiler.y
 InputName=aslcompiler
 
 BuildCmds= \
-	..\..\Tools_3rd_party\BisonFlex\bison_custom.exe -pAslCompiler -t -d
-v -o$(ProjDir)/AslCompiler/$(InputName).y.c $(InputPath)
+	bison -d -pAslCompiler -v $(InputPath) -vd -o$(InputName).y.c
 
-"AslCompiler/$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
 
-"AslCompiler/$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Building iASL Parser from $(InputPath) to
AslCompilerDebug/$(InputName)Debug.y.c
generate/msvc/AslCompiler.dsp +1 -3
+# Begin Custom Build - Yaccing $(InputPath)...
 InputPath=../../source/compiler/aslcompiler.y
 InputName=aslcompiler
 
 BuildCmds= \
-	..\..\Tools_3rd_party\BisonFlex\bison_custom.exe -pAslCompiler -t -d
-v -oAslCompilerDebug/$(InputName).y.c $(InputPath) \
-	move AslCompilerDebug\$(InputName).y.c
AslCompilerDebug\$(InputName)Debug.y.c \
generate/msvc/AslCompiler.dsp +141 -2
-
+	bison -d -pAslCompiler -v $(InputPath) -vd -o$(InputName).y.c
+
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\dtparser.l
+
+!IF  "$(CFG)" == "AslCompiler - Win32 Release"
+
+# Begin Custom Build - Lexing $(InputPath)...
+InputPath=..\..\source\compiler\dtparser.l
+InputName=dtparser
+
+"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -PDtParser -o$(InputName).l.c $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Lexing $(InputPath)...
+InputPath=..\..\source\compiler\dtparser.l
+InputName=dtparser
+
+"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -PDtParser -o$(InputName).l.c $(InputPath)
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\dtparser.y
+
+!IF  "$(CFG)" == "AslCompiler - Win32 Release"
+
+# Begin Custom Build - Yaccing $(InputPath)...
+InputPath=..\..\source\compiler\dtparser.y
+InputName=dtparser
+
+BuildCmds= \
+	bison -d -pDtParser -v $(InputPath) -vd -o$(InputName).y.c
+
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Yaccing $(InputPath)...
+InputPath=..\..\source\compiler\dtparser.y
+InputName=dtparser
+
+BuildCmds= \
+	bison -d -pDtParser -v $(InputPath) -vd -o$(InputName).y.c
+
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prparser.l
+
+!IF  "$(CFG)" == "AslCompiler - Win32 Release"
+
+# Begin Custom Build - Lexing $(InputPath)...
+InputPath=..\..\source\compiler\prparser.l
+InputName=prparser
+
+"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -PPrParser -o$(InputName).l.c $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Lexing $(InputPath)...
+InputPath=..\..\source\compiler\prparser.l
+InputName=prparser
+
+"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -PPrParser -o$(InputName).l.c $(InputPath)
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prparser.y
+
+!IF  "$(CFG)" == "AslCompiler - Win32 Release"
+
+# Begin Custom Build - Yaccing $(InputPath)...
+InputPath=..\..\source\compiler\prparser.y
+InputName=prparser
+
+BuildCmds= \
+	bison -d -pPrParser -v $(InputPath) -vd -o$(InputName).y.c
+
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Yaccing $(InputPath)...
+InputPath=..\..\source\compiler\prparser.y
+InputName=prparser
+
+BuildCmds= \
+	bison -d -pPrParser -v $(InputPath) -vd -o$(InputName).y.c
 
-"AslCompilerDebug/$(InputName)Debug.y.c" : $(SOURCE) "$(INTDIR)"
"$(OUTDIR)"
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
-"AslCompilerDebug/$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
# End Custom Build
source/compiler/aslcompiler.y +0 -1
index 7191e85..2ed10c1 100644
@@ -141,7 +141,6 @@ void *                      AslLocalAllocate (unsigned
 int Size);
 
 /* Bison/yacc configuration */
 
-#define static
 #undef alloca
 #define alloca              AslLocalAllocate
#define yytname AslCompilername
source/compiler/dtparser.y +7 -0
index c400549..46ef7b2 100644
@@ -120,6 +120,13 @@
 #define _COMPONENT          DT_COMPILER
         ACPI_MODULE_NAME    ("dtparser")
 
+void *                      AslLocalAllocate (unsigned int Size);
+
+/* Bison/yacc configuration */
+
+#undef alloca
+#define alloca              AslLocalAllocate
+
 int                         DtParserlex (void);
 int                         DtParserparse (void);
 void                        DtParsererror (char const *msg);
source/compiler/prparser.y +7 -1
index 2b19713..c2f2150 100644
@@ -120,6 +120,13 @@
 #define _COMPONENT          ASL_PREPROCESSOR
         ACPI_MODULE_NAME    ("prparser")
 
+void *                      AslLocalAllocate (unsigned int Size);
+
+/* Bison/yacc configuration */
+
+#undef alloca
+#define alloca              AslLocalAllocate
+
 int                         PrParserlex (void);
 int                         PrParserparse (void);
 void                        PrParsererror (char const *msg);
--
1.7.10

Moore

2013-01-15 20:06 UTC #4 lore raw

Re: [Devel] [PATCH 2/2] Update MSVC project/workspace files.

In reply to Lv Zheng

The project files in generate/msvc are for MSVC 6.0 and are deprecated and no longer supported. At this time, deletion should be considered.

The current windows project files are in generate/msvc9.

Bob

Quoted 1,828 lines

-----Original Message-----
From: Zheng, Lv
Sent: Sunday, January 13, 2013 4:36 PM
To: Moore, Robert
Cc: Rafael J Wysocki; Brown, Len; Huang, Ying; devel(a)acpica.org; Zheng, Lv
Subject: [PATCH 2/2] Update MSVC project/workspace files.
This patch updates MSVC build files to make windows build working. Following fixes have been done to the MSVC files:
1. Add missing .c files into .dsp.
2. Convert abstract paths in .dsp into relative paths.
3. Add AcpiCA.dsw to collect non-Linux projects.
4. Update .dsp, compiling .y/.l using standard GNU flex/bison.
5. Fix link issues in .y.
Signed-off-by Lv Zheng <lv.zheng(a)intel.com>
---
 generate/msvc/AcpiBin.dsp       |   32 ++--
 generate/msvc/AcpiCA.dsw        |  101 +++++++++++
 generate/msvc/AcpiExec.dsp      |  116 ++++++++++++-
 generate/msvc/AcpiNames.dsp     |   52 +++++-
 generate/msvc/AcpiSrc.dsp       |   20 +--
 generate/msvc/AcpiSrc_Linux.dsp |   13 +-
 generate/msvc/AcpiSubsystem.dsp |   45 ++++-
 generate/msvc/AcpiXtract.dsp    |   32 +++-
 generate/msvc/AslCompiler.dsp   |  360 ++++++++++++++++++++++++++++++----
-----
 source/compiler/aslcompiler.y   |    1 -
 source/compiler/dtparser.y      |    7 +
 source/compiler/prparser.y      |    7 +
 12 files changed, 652 insertions(+), 134 deletions(-)
 create mode 100644 generate/msvc/AcpiCA.dsw
generate/msvc/AcpiBin.dsp +2 -2
index cbbb5c5..4cb4770 100755
@@ -37,12 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiBin"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiBin"
+# PROP Output_Dir "AcpiBin"
+# PROP Intermediate_Dir "AcpiBin"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\include" /D "NDEBUG" /D "ACPI_BIN_APP" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /c +# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_BIN_APP" /D "__STDC__" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
generate/msvc/AcpiBin.dsp +0 -0
@@ -51,12 +51,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"advapi32.lib" +# ADD LINK32 kernel32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"advapi32.lib"
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Desc=Copy AcpiBin.exe to libraries
-PostBuild_Cmds=copy acpibin\acpibin.exe ..\..\libraries dir
..\..\libraries\acpibin.exe
generate/msvc/AcpiBin.dsp +1 -0
+PostBuild_Cmds=copy acpibin\acpibin.exe ..\..\libraries
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "AcpiBin - Win32 Debug"
@@ -68,12 +68,12 @@ PostBuild_Cmds=copy acpibin\acpibin.exe
..\..\libraries dir ..\..\libraries\acpi
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiBin.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiBinDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiBinDebug"
+# PROP Output_Dir "AcpiBinDebug"
+# PROP Intermediate_Dir "AcpiBinDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_BIN_APP" /FR /FD /GZ /c
+# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_BIN_APP" /D "__STDC__" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
generate/msvc/AcpiBin.dsp +0 -0
@@ -81,12 +81,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiBinDebug/AcpiBin.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiBinDebug/AcpiBin.exe" +# ADD LINK32 kernel32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Desc=Copy AcpiBinDebug.exe to libraries
-PostBuild_Cmds=copy acpibindebug\acpibin.exe
..\..\libraries\AcpiBinDebug.exe dir ..\..\libraries\acpibindebug.exe
+PostBuild_Cmds=copy acpibindebug\acpibin.exe ..\..\libraries\AcpiBinDebug.exe
# End Special Build Tool
!ENDIF
generate/msvc/AcpiBin.dsp +12 -0
@@ -139,6 +139,14 @@ SOURCE=..\..\source\components\utilities\utdebug.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utdecode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utexcep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utglobal.c
 # End Source File
 # Begin Source File
@@ -163,6 +171,10 @@ SOURCE=..\..\source\components\utilities\utstate.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utxferror.c
 # End Source File
 # End Group
generate/msvc/AcpiCA.dsw new file +4 -0
new file mode 100644
index 0000000..fc6d2d3
@@ -0,0 +1,101 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiBin"=.\AcpiBin.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiExec"=.\AcpiExec.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiNames"=.\AcpiNames.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiSrc"=.\AcpiSrc.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiSubsystem"=.\AcpiSubsystem.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AcpiXtract"=.\AcpiXtract.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Project: "AslCompiler"=.\AslCompiler.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +12 -0
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+#########################################################################
######
generate/msvc/AcpiCA.dsw new file +1 -0
+
generate/msvc/AcpiExec.dsp +2 -2
index c306f8d..faa42dc 100755
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiExec"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiExec"
+# PROP Output_Dir "AcpiExec"
+# PROP Intermediate_Dir "AcpiExec"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /YX /FD /c
generate/msvc/AcpiExec.dsp +0 -0
@@ -51,14 +51,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking existence of acpi/libraries directory PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy acpiexec.exe to libraries
-PostBuild_Cmds=copy acpiexec\acpiexec.exe ..\..\libraries dir
..\..\libraries\acpiexec.exe
generate/msvc/AcpiExec.dsp +1 -0
+PostBuild_Cmds=copy acpiexec\acpiexec.exe ..\..\libraries
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "AcpiExec - Win32 Debug"
@@ -70,8 +70,8 @@ PostBuild_Cmds=copy acpiexec\acpiexec.exe
..\..\libraries dir ..\..\libraries\ac
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiExec.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiExecDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiExecDebug"
+# PROP Output_Dir "AcpiExecDebug"
+# PROP Intermediate_Dir "AcpiExecDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
generate/msvc/AcpiExec.dsp +0 -0
@@ -83,14 +83,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiExecDebug/AcpiExec.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libcmtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /nodefaultlib:"libcmt.lib" /pdbtype:sept /out:"/acpica/generate/msvc/AcpiExecDebug/AcpiExec.exe"
+# ADD LINK32 libcmtd.lib kernel32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /nodefaultlib:"libcmt.lib" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking existence of acpi/libraries directory PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy acpiexecdebug.exe to libraries
-PostBuild_Cmds=copy acpiexecdebug\acpiexec.exe
..\..\libraries\acpiexecdebug.exe dir ..\..\libraries\acpiexecdebug.exe
+PostBuild_Cmds=copy acpiexecdebug\acpiexec.exe ..\..\libraries\acpiexecdebug.exe
# End Special Build Tool
!ENDIF
generate/msvc/AcpiExec.dsp +0 -0
@@ -107,6 +107,34 @@ PostBuild_Cmds=copy acpiexecdebug\acpiexec.exe
..\..\libraries\acpiexecdebug.exe
# PROP Default_Filter ".c"
# Begin Source File
generate/msvc/AcpiExec.dsp +80 -0
+SOURCE=..\..\source\components\debugger\dbconvert.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\events\evhandler.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\namespace\nsprepkg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psopinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\resources\rsdumpinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utaddress.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utalloc.c
 # End Source File
 # Begin Source File
@@ -123,6 +151,10 @@ SOURCE=..\..\source\components\utilities\utdebug.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utdecode.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utdelete.c
 # End Source File
 # Begin Source File
@@ -131,6 +163,10 @@ SOURCE=..\..\source\components\utilities\uteval.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utexcep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utglobal.c
 # End Source File
 # Begin Source File
@@ -177,6 +213,10 @@ SOURCE=..\..\source\components\utilities\utosi.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utownerid.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utresrc.c
 # End Source File
 # Begin Source File
@@ -185,6 +225,10 @@ SOURCE=..\..\source\components\utilities\utstate.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\uttrack.c
 # End Source File
 # Begin Source File
@@ -195,6 +239,14 @@ SOURCE=..\..\source\components\utilities\utxface.c
 
 SOURCE=..\..\source\components\utilities\utxferror.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utxfinit.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utxfmutex.c
+# End Source File
 # End Group
 # Begin Group "Namespace"
 
@@ -285,6 +337,10 @@ SOURCE=..\..\source\components\hardware\hwacpi.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\hardware\hwesleep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\hardware\hwgpe.c
 # End Source File
 # Begin Source File
@@ -307,6 +363,10 @@ SOURCE=..\..\source\components\hardware\hwvalid.c
 
 SOURCE=..\..\source\components\hardware\hwxface.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\hardware\hwxfsleep.c
+# End Source File
 # End Group
 # Begin Group "Events"
 
@@ -317,6 +377,10 @@ SOURCE=..\..\source\components\events\evevent.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\events\evglock.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\EVENTS\evgpe.c
 # End Source File
 # Begin Source File
@@ -425,6 +489,14 @@ SOURCE=..\..\source\COMPONENTS\DEBUGGER\dbinput.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\debugger\dbmethod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\debugger\dbnames.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\DEBUGGER\dbstats.c
 # End Source File
 # Begin Source File
@@ -461,6 +533,10 @@ SOURCE=..\..\source\components\tables\tbxface.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\tables\tbxfload.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\tables\tbxfroot.c
 # End Source File
 # End Group
@@ -526,6 +602,10 @@ SOURCE=..\..\source\components\resources\rsmisc.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\resources\rsserial.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\resources\rsutils.c
 # End Source File
 # Begin Source File
@@ -542,6 +622,10 @@
SOURCE=..\..\source\COMPONENTS\Disassembler\dmbuffer.c
# End Source File
# Begin Source File
generate/msvc/AcpiExec.dsp +4 -0
+SOURCE=..\..\source\components\disassembler\dmdeferred.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\Disassembler\dmnames.c
 # End Source File
 # Begin Source File
@@ -562,6 +646,10 @@
SOURCE=..\..\source\COMPONENTS\Disassembler\dmresrcl.c
# End Source File
# Begin Source File
generate/msvc/AcpiExec.dsp +16 -0
+SOURCE=..\..\source\components\disassembler\dmresrcl2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\Disassembler\dmresrcs.c
 # End Source File
 # Begin Source File
@@ -718,6 +806,14 @@ SOURCE=..\..\source\components\parser\psxface.c
 # PROP Default_Filter ".c"
 # Begin Source File
 
+SOURCE=..\..\source\components\dispatcher\dsargs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\dispatcher\dscontrol.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\dispatcher\dsfield.c
 # End Source File
 # Begin Source File
@@ -754,6 +850,10 @@ SOURCE=..\..\source\components\dispatcher\dswload.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\dispatcher\dswload2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\dispatcher\dswscope.c
 # End Source File
 # Begin Source File
generate/msvc/AcpiNames.dsp +2 -2
index 3fa41de..1a8d630 100755
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiNames"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiNames"
+# PROP Output_Dir "AcpiNames"
+# PROP Intermediate_Dir "AcpiNames"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /YX /FD /c
generate/msvc/AcpiNames.dsp +0 -0
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /machine:I386
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Cmds=copy AcpiNames\AcpiNames.exe ..\..\libraries
generate/msvc/AcpiNames.dsp +0 -0
@@ -66,8 +66,8 @@ PostBuild_Cmds=copy AcpiNames\AcpiNames.exe
..\..\libraries
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiNames.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiNamesDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiNamesDebug"
+# PROP Output_Dir "AcpiNamesDebug"
+# PROP Intermediate_Dir "AcpiNamesDebug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /Gr /Za /W4 /Gm /Gi /GX /ZI /Od /I
"..\..\source\Include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "ACPI_APPLICATION" /D "ACPI_SINGLE_THREADED" /D "ACPI_DEBUGGER" /FR /FD /GZ /c
generate/msvc/AcpiNames.dsp +0 -0
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Cmds=copy AcpiNamesdebug\AcpiNames.exe
..\..\libraries\AcpiNamesdebug.exe
generate/msvc/AcpiNames.dsp +0 -0
@@ -112,6 +112,10 @@
SOURCE=..\..\source\os_specific\service_layers\oswinxf.c
# PROP Default_Filter ""
# Begin Source File
generate/msvc/AcpiNames.dsp +40 -0
+SOURCE=..\..\source\components\utilities\utaddress.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utalloc.c
 # End Source File
 # Begin Source File
@@ -120,10 +124,18 @@ SOURCE=..\..\source\components\utilities\utcache.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utdecode.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utdelete.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utexcep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utglobal.c
 # End Source File
 # Begin Source File
@@ -172,6 +184,10 @@ SOURCE=..\..\source\components\utilities\utxface.c
 
 SOURCE=..\..\source\components\utilities\utxferror.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utxfinit.c
+# End Source File
 # End Group
 # Begin Group "Tables"
 
@@ -198,6 +214,10 @@ SOURCE=..\..\source\components\tables\tbxface.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\tables\tbxfload.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\tables\tbxfroot.c
 # End Source File
 # End Group
@@ -334,6 +354,10 @@ SOURCE=..\..\source\components\dispatcher\dswload.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\dispatcher\dswload2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\dispatcher\dswscope.c
 # End Source File
 # Begin Source File
@@ -377,6 +401,22 @@ SOURCE=..\..\source\tools\AcpiNames\anstubs.c
 
 SOURCE=..\..\source\tools\AcpiNames\antables.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psopinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utownerid.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
 # End Group
 # Begin Group "Header Files"
 
generate/msvc/AcpiSrc.dsp +2 -2
index a1976b5..7ff619f 100755
@@ -37,12 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrc"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrc"
+# PROP Output_Dir "AcpiSrc"
+# PROP Intermediate_Dir "AcpiSrc"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\Include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /FR /FD /c
+# ADD CPP /nologo /Gr /W4 /O2 /I "..\..\source\Include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /D "__STDC__" /FR /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
generate/msvc/AcpiSrc.dsp +0 -0
@@ -51,14 +51,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /machine:I386
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking existence of acpi/libraries directory PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy acpisrc.exe to libraries
-PostBuild_Cmds=copy acpisrc\acpisrc.exe ..\..\libraries dir
..\..\libraries\acpisrc.exe
generate/msvc/AcpiSrc.dsp +1 -0
+PostBuild_Cmds=copy acpisrc\acpisrc.exe ..\..\libraries
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "AcpiSrc - Win32 Debug"
@@ -70,12 +70,12 @@ PostBuild_Cmds=copy acpisrc\acpisrc.exe
..\..\libraries dir ..\..\libraries\acpi
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiSrc.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrcDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrcDebug"
+# PROP Output_Dir "AcpiSrcDebug"
+# PROP Intermediate_Dir "AcpiSrcDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\Include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /FR /FD /GZ /c
+# ADD CPP /nologo /Gr /W4 /Zi /Od /Gf /I "..\..\source\Include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "ACPI_DEBUG" /D "ACPI_APPLICATION" /D "_IA32" /D "__STDC__" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
generate/msvc/AcpiSrc.dsp +0 -0
@@ -83,14 +83,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AcpiSrcDebug/AcpiSrc.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiSrcDebug/AcpiSrc.exe"
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking existence of acpi/components/libraries directory PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy acpisrcdebug.exe to libraries
-PostBuild_Cmds=copy acpisrcdebug\acpisrc.exe
..\..\libraries\acpisrcdebug.exe dir ..\..\libraries\acpisrcdebug.exe
+PostBuild_Cmds=copy acpisrcdebug\acpisrc.exe ..\..\libraries\acpisrcdebug.exe
# End Special Build Tool
!ENDIF
generate/msvc/AcpiSrc_Linux.dsp +2 -2
index cb0a657..74658f4 100755
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrcLinux"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrcLinux"
+# PROP Output_Dir "AcpiSrcLinux"
+# PROP Intermediate_Dir "AcpiSrcLinux"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /Yu"stdafx.h" /FD /c
generate/msvc/AcpiSrc_Linux.dsp +0 -0
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
/o"/acpica/generate/msvc/AcpiSrcLinux/AcpiSrcLinux.bsc"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /machine:I386
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Desc=Checking existence of acpi/libraries directory
generate/msvc/AcpiSrc_Linux.dsp +0 -0
@@ -69,8 +69,8 @@ PostBuild_Cmds=copy AcpiSrcLinux\AcpiSrcLinux.exe
..\..\libraries dir ..\..\libr
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiSrc_Linux.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSrcLinuxDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSrcLinuxDebug"
+# PROP Output_Dir "AcpiSrcLinuxDebug"
+# PROP Intermediate_Dir "AcpiSrcLinuxDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
generate/msvc/AcpiSrc_Linux.dsp +0 -0
@@ -83,7 +83,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
/o"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrc_LinuxDebug.bsc" /o"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrcLinux.bsc"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrc_LinuxDebug.exe" /out:"/acpica/generate/msvc/AcpiSrcLinuxDebug\AcpiSrcLinuxDebug.exe" +# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiSrcLinuxDebug/AcpiSrc_LinuxDebug.exe"
generate/msvc/AcpiSrc_Linux.dsp +1 -0
+# SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking existence of acpi/components/libraries directory
generate/msvc/AcpiSubsystem.dsp +2 -2
index 4b574d4..e440056 100755
@@ -37,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSubsystem"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSubsystem"
+# PROP Output_Dir "AcpiSubsystem"
+# PROP Intermediate_Dir "AcpiSubsystem"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D
"_LIB" /YX /FD /c
# ADD CPP /nologo /Gr /MT /Za /W4 /O1 /I "..\..\source\Include" /D
"ACPI_LIBRARY" /D "NDEBUG" /D "_GEN" /D "DRIVER" /D "_WINDOWS" /D PROCESSOR_ARCHITECTURE=x86 /D "WIN32" /FR /FD /c
generate/msvc/AcpiSubsystem.dsp +0 -1
@@ -50,7 +50,6 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /out:"/acpica/generate/msvc/AcpiSubsystem\AcpiSubsystem.lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking existence of acpi/libraries directory
@@ -68,8 +67,8 @@ PostBuild_Cmds=copy AcpiSubsystem\acpisubsystem.lib
..\..\libraries\acpica.lib d
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiSubsystem.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiSubsystemDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiSubsystemDebug"
+# PROP Output_Dir "AcpiSubsystemDebug"
+# PROP Intermediate_Dir "AcpiSubsystemDebug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS"
/D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /Gr /MTd /Za /W4 /Zi /Oa /Og /Os /Oy /Gf /I
"..\..\source\Include" /D "ACPI_LIBRARY" /D "ACPI_FULL_DEBUG" /D "_WINDOWS" /D PROCESSOR_ARCHITECTURE=x86 /D "WIN32" /FR /FD /c
generate/msvc/AcpiSubsystem.dsp +0 -0
@@ -80,13 +79,13 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
/o"/acpica/generate/msvc/AcpiSubsystemDebug/AcpiSubsystem.bsc"
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"/acpica/generate/msvc/AcpiSubsystemDebug\AcpiSubsystem.lib"
generate/msvc/AcpiSubsystem.dsp +1 -1
+# ADD LIB32 /nologo
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Checking existence of acpi/libraries directory
 PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries
 PostBuild_Desc=Copy library to libraries
-PostBuild_Cmds=copy AcpiSubsystemDebug\acpisubsystem.lib
..\..\libraries\acpica_dbg.lib dir ..\..\libraries\acpica_dbg.lib
+PostBuild_Cmds=copy AcpiSubsystemDebug\acpisubsystem.lib ..\..\libraries\acpica_dbg.lib
# End Special Build Tool
!ENDIF
generate/msvc/AcpiSubsystem.dsp +0 -0
@@ -103,6 +102,30 @@ PostBuild_Cmds=copy
AcpiSubsystemDebug\acpisubsystem.lib ..\..\libraries\acpica_
# PROP Default_Filter ".c"
# Begin Source File
generate/msvc/AcpiSubsystem.dsp +32 -0
+SOURCE=..\..\source\components\debugger\dbconvert.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\events\evhandler.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\namespace\nsprepkg.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\parser\psopinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\resources\rsdumpinfo.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utalloc.c
 # End Source File
 # Begin Source File
@@ -168,6 +191,10 @@ SOURCE=..\..\source\components\utilities\utosi.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utownerid.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utresrc.c
 # End Source File
 # Begin Source File
@@ -176,6 +203,10 @@ SOURCE=..\..\source\components\utilities\utstate.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utxface.c
 # End Source File
 # Begin Source File
generate/msvc/AcpiXtract.dsp +2 -2
index 305b881..cebefd7 100755
@@ -37,12 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AcpiXtract"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiXtract"
+# PROP Output_Dir "AcpiXtract"
+# PROP Intermediate_Dir "AcpiXtract"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"
/D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
+# ADD CPP /nologo /Za /W4 /O2 /I "../../source/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
generate/msvc/AcpiXtract.dsp +0 -0
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /map /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /map /machine:I386
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
generate/msvc/AcpiXtract.dsp +0 -0
@@ -68,12 +68,12 @@ PostBuild_Cmds=copy AcpiXtract\AcpiXtract.exe
..\..\libraries
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
generate/msvc/AcpiXtract.dsp +2 -2
-# PROP Output_Dir "/acpica/generate/msvc/AcpiXtractDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AcpiXtractDebug"
+# PROP Output_Dir "AcpiXtractDebug"
+# PROP Intermediate_Dir "AcpiXtractDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Za /W4 /Zi /Od /Gf /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# ADD CPP /nologo /Za /W4 /Zi /Od /Gf /I "../../source/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
generate/msvc/AcpiXtract.dsp +0 -0
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
/o"/acpica/generate/msvc/AcpiXtractDebug/AcpiXtract.bsc"
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept /out:"/acpica/generate/msvc/AcpiXtractDebug/AcpiXtract.exe" +# ADD LINK32 kernel32.lib advapi32.lib /nologo /subsystem:console /incremental:no /map /debug /machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
generate/msvc/AcpiXtract.dsp +0 -0
@@ -98,6 +98,9 @@ PostBuild_Cmds=copy AcpiXtractDebug\AcpiXtract.exe
..\..\libraries\AcpiXtractDeb
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
generate/msvc/AcpiXtract.dsp +16 -0
+# Begin Group "AcpiXtract"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=..\..\source\tools\AcpiXtract\acpixtract.c
@@ -113,6 +116,19 @@ SOURCE=..\..\source\tools\AcpiXtract\acpixtract.c
 !ENDIF
 
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\tools\acpixtract\axmain.c
+# End Source File
+# End Group
+# Begin Group "Common"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\source\common\getopt.c
+# End Source File
+# End Group
 # End Group
 # Begin Group "Header Files"
 
generate/msvc/AslCompiler.dsp +2 -2
index c4d074c..0756517 100755
@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "/acpica/generate/msvc/AslCompiler"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AslCompiler"
+# PROP Output_Dir "AslCompiler"
+# PROP Intermediate_Dir "AslCompiler"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "_AFXDLL" /YX /FD /c
-# ADD CPP /nologo /Za /W4 /O2 /I "$(OutDir)..\\" /I "..\..\source\Include" /I "$(OutDir)" /I "..\..\source\compiler" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "YY_NEVER_INTERACTIVE" /D "ACPI_ASL_COMPILER" /FR /FD /c
+# ADD CPP /nologo /MT /Za /W4 /O2 /I "..\..\source\Include" /I "..\..\source\compiler" /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "YY_NEVER_INTERACTIVE" /D "ACPI_ASL_COMPILER" /FR /FD /c
# SUBTRACT CPP /X /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
generate/msvc/AslCompiler.dsp +0 -1
@@ -54,12 +54,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo /o"/acpica/generate/msvc/AslCompiler/AslCompiler.bsc"
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 ..\..\tools_3rd_party\BisonFlex\libflex.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /machine:I386 /pdb:"/acpica/generate/msvc/AslCompiler/AslCompiler.pdb" /out:"/acpica/generate/msvc/AslCompiler/AslCompiler.exe" /pdb:"/acpica/generate/msvc/AslCompiler/AslCompiler.pdb"
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /machine:I386 /pdb:"/acpica/generate/msvc/AslCompiler/AslCompiler.pdb" /out:"/acpica/generate/msvc/AslCompiler/AslCompiler.exe" /pdb:"/acpica/generate/msvc/AslCompiler/AslCompiler.pdb"
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy iasl.exe to libraries directory
-PostBuild_Cmds=copy AslCompiler\aslcompiler.exe
\acpica\Libraries\iasl.exe dir \acpica\libraries\iasl.exe
generate/msvc/AslCompiler.dsp +3 -2
+PostBuild_Cmds=copy AslCompiler\aslcompiler.exe ..\..\libraries\iasl.exe
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
@@ -71,12 +71,12 @@ PostBuild_Cmds=copy AslCompiler\aslcompiler.exe
 \acpica\Libraries\iasl.exe	dir \
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "/acpica/generate/msvc/AslCompilerDebug"
-# PROP Intermediate_Dir "/acpica/generate/msvc/AslCompilerDebug"
+# PROP Output_Dir "AslCompilerDebug"
+# PROP Intermediate_Dir "AslCompilerDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_AFXDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /Za /W4 /Gi /Zi /Ot /Oa /Oy /Gf /I "$(OutDir)..\\" /I "..\..\source\Include" /I "$(OutDir)" /I "..\..\source\compiler" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "YY_NEVER_INTERACTIVE" /D "ACPI_ASL_COMPILER" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /Za /W4 /Gi /Zi /Ot /Oa /Oy /Gf /I "..\..\source\Include" /I "..\..\source\compiler" /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "YY_NEVER_INTERACTIVE" /D "ACPI_ASL_COMPILER" /FR /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
generate/msvc/AslCompiler.dsp +0 -0
@@ -86,12 +86,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
/o"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.bsc"
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386
/pdbtype:sept
-# ADD LINK32 ..\..\tools_3rd_party\BisonFlex\libflex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /incremental:no /debug /machine:I386 /nodefaultlib:"libcmt.lib" /pdbtype:sept /pdb:"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.pdb" /out:"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.exe" /pdb:"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.pdb" /map:"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.map" +# ADD LINK32 kernel32.lib advapi32.lib /nologo /pdb:none /debug /machine:I386 /nodefaultlib:"libcmt.lib" /pdb:"/acpica/generate/msvc/AslCompilerDebug/AslCompiler.pdb"
# Begin Special Build Tool
SOURCE="$(InputPath)"
PreLink_Cmds=if NOT EXIST ..\..\libraries mkdir ..\..\libraries PostBuild_Desc=Copy iasldebug.exe to libraries directory
-PostBuild_Cmds=copy AslCompilerDebug\aslcompiler.exe
\acpica\Libraries\iasldebug.exe dir \acpica\libraries\iasldebug.exe
+PostBuild_Cmds=copy AslCompilerDebug\aslcompiler.exe ..\..\\libraries\iasldebug.exe
# End Special Build Tool
!ENDIF
generate/msvc/AslCompiler.dsp +0 -0
@@ -108,6 +108,10 @@ PostBuild_Cmds=copy AslCompilerDebug\aslcompiler.exe
\acpica\Libraries\iasldebug
# PROP Default_Filter ".c"
# Begin Source File
generate/msvc/AslCompiler.dsp +80 -0
+SOURCE=..\..\source\components\utilities\utaddress.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utalloc.c
 # End Source File
 # Begin Source File
@@ -124,10 +128,18 @@ SOURCE=..\..\source\components\utilities\utdebug.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utdecode.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utdelete.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utexcep.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utglobal.c
 # End Source File
 # Begin Source File
@@ -156,6 +168,10 @@ SOURCE=..\..\source\components\utilities\utobject.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utownerid.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utresrc.c
 # End Source File
 # Begin Source File
@@ -164,6 +180,10 @@ SOURCE=..\..\source\components\utilities\utstate.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\utilities\utstring.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\utilities\utxface.c
 # End Source File
 # Begin Source File
@@ -224,6 +244,10 @@ SOURCE=..\..\source\compiler\aslanalyze.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\compiler\aslbtypes.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\compiler\aslcodegen.c
 # End Source File
 # Begin Source File
@@ -236,6 +260,10 @@ SOURCE=..\..\source\compiler\aslerror.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\compiler\aslfileio.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\compiler\aslfiles.c
 # End Source File
 # Begin Source File
@@ -244,6 +272,10 @@ SOURCE=..\..\source\compiler\aslfold.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\compiler\aslhex.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\compiler\asllength.c
 # End Source File
 # Begin Source File
@@ -268,6 +300,14 @@ SOURCE=..\..\source\compiler\aslmap.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\compiler\aslmethod.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\aslnamesp.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\compiler\aslopcodes.c
 # End Source File
 # Begin Source File
@@ -312,6 +352,10 @@ SOURCE=..\..\source\compiler\aslrestype2q.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\compiler\aslrestype2s.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\compiler\aslrestype2w.c
 # End Source File
 # Begin Source File
@@ -334,6 +378,38 @@ SOURCE=..\..\source\compiler\asltree.c
 
 SOURCE=..\..\source\compiler\aslutils.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\asluuid.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\aslwalks.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\aslxref.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\dtexpress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prexpress.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prmacros.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prscan.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prutils.c
+# End Source File
 # End Group
 # Begin Group "Common"
 
@@ -352,6 +428,10 @@ SOURCE=..\..\source\common\adwalk.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\common\ahpredef.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\common\dmextern.c
 # End Source File
 # Begin Source File
@@ -394,67 +474,27 @@
SOURCE=..\..\source\os_specific\service_layers\oswinxf.c
# PROP Default_Filter "*.c, *.h"
# Begin Source File
generate/msvc/AslCompiler.dsp +10 ~~-50~~
-SOURCE=.\AslCompiler\AslCompiler.l.c
-
-!IF  "$(CFG)" == "AslCompiler - Win32 Release"
-
-# ADD CPP /W3
-
-!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-# ADD CPP /W3
-
-!ENDIF
-
+SOURCE=.\aslcompiler.l.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\AslCompiler\AslCompiler.y.c
-
-!IF  "$(CFG)" == "AslCompiler - Win32 Release"
-
-# ADD CPP /W3
-
-!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-# ADD CPP /W3
-
-!ENDIF
-
+SOURCE=.\aslcompiler.y.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\AslCompilerDebug\AslCompilerDebug.l.c
-
-!IF  "$(CFG)" == "AslCompiler - Win32 Release"
-
-# PROP Exclude_From_Build 1
-# ADD CPP /W3
-
-!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
-
-# ADD CPP /W3
-
-!ENDIF
-
+SOURCE=.\dtparser.l.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\AslCompilerDebug\AslCompilerDebug.y.c
-
-!IF  "$(CFG)" == "AslCompiler - Win32 Release"
-
-# PROP Exclude_From_Build 1
-# ADD CPP /W3
-
-!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
-
-# ADD CPP /W3
+SOURCE=.\dtparser.y.c
+# End Source File
+# Begin Source File
 
-!ENDIF
+SOURCE=.\prparser.l.c
+# End Source File
+# Begin Source File
 
+SOURCE=.\prparser.y.c
 # End Source File
 # End Group
 # Begin Group "Disassembler"
@@ -470,6 +510,10 @@
SOURCE=..\..\source\COMPONENTS\disassembler\dmbuffer.c
# End Source File
# Begin Source File
generate/msvc/AslCompiler.dsp +4 -0
+SOURCE=..\..\source\components\disassembler\dmdeferred.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\disassembler\dmnames.c
 # End Source File
 # Begin Source File
@@ -490,6 +534,10 @@
SOURCE=..\..\source\COMPONENTS\disassembler\dmresrcl.c
# End Source File
# Begin Source File
generate/msvc/AslCompiler.dsp +24 -1
+SOURCE=..\..\source\components\disassembler\dmresrcl2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\COMPONENTS\disassembler\dmresrcs.c
 # End Source File
 # Begin Source File
@@ -618,10 +666,18 @@ SOURCE=..\..\source\components\parser\psloop.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\parser\psobject.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\parser\psopcode.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\parser\psopinfo.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\parser\psparse.c
 # End Source File
 # Begin Source File
@@ -646,6 +702,14 @@ SOURCE=..\..\source\components\parser\pswalk.c
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\source\components\dispatcher\dsargs.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\components\dispatcher\dscontrol.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\dispatcher\dsfield.c
 # End Source File
 # Begin Source File
@@ -670,6 +734,10 @@ SOURCE=..\..\source\components\dispatcher\dswload.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\source\components\dispatcher\dswload2.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\source\components\dispatcher\dswscope.c
 # End Source File
 # Begin Source File
@@ -753,25 +821,24 @@ SOURCE=../../source/compiler/aslcompiler.l
 !IF  "$(CFG)" == "AslCompiler - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Building iASL Lexer  from $(InputPath) to
AslCompiler/$(InputName).l.c
generate/msvc/AslCompiler.dsp +1 -3
-ProjDir=.
+# Begin Custom Build - Lexing $(InputPath)...
 InputPath=../../source/compiler/aslcompiler.l
 InputName=aslcompiler
 
-"AslCompiler/$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\Tools_3rd_party\BisonFlex\flex.exe -PAslCompiler -i -s -
o$(ProjDir)/AslCompiler/$(InputName).l.c $(InputPath) +"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
generate/msvc/AslCompiler.dsp +1 -1
+	flex -PAslCompiler -o$(InputName).l.c $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Building iASL Lexer  from $(InputPath) to
AslCompilerDebug/$(InputName)Debug.l.c
+# Begin Custom Build - Lexing $(InputPath)...
InputPath=../../source/compiler/aslcompiler.l
InputName=aslcompiler
-"AslCompilerDebug/$(InputName)Debug.l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
generate/msvc/AslCompiler.dsp +0 -1
-	..\..\Tools_3rd_party\BisonFlex\flex.exe -PAslCompiler -i -s -
oAslCompilerDebug/$(InputName)Debug.l.c $(InputPath) +"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
generate/msvc/AslCompiler.dsp +1 -1
+	flex -PAslCompiler -o$(InputName).l.c $(InputPath)
 
 # End Custom Build
@@ -785,37 +852,174 @@ SOURCE=../../source/compiler/aslcompiler.y
 !IF  "$(CFG)" == "AslCompiler - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Building iASL Parser from $(InputPath) to
AslCompiler/$(InputName).y.c
generate/msvc/AslCompiler.dsp +4 -6
-ProjDir=.
+# Begin Custom Build - Yaccing $(InputPath)...
 InputPath=../../source/compiler/aslcompiler.y
 InputName=aslcompiler
 
 BuildCmds= \
-	..\..\Tools_3rd_party\BisonFlex\bison_custom.exe -pAslCompiler -t -d
-v -o$(ProjDir)/AslCompiler/$(InputName).y.c $(InputPath)
+	bison -d -pAslCompiler -v $(InputPath) -vd -o$(InputName).y.c
 
-"AslCompiler/$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
 
-"AslCompiler/$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
-# Begin Custom Build - Building iASL Parser from $(InputPath) to
AslCompilerDebug/$(InputName)Debug.y.c
generate/msvc/AslCompiler.dsp +1 -3
+# Begin Custom Build - Yaccing $(InputPath)...
 InputPath=../../source/compiler/aslcompiler.y
 InputName=aslcompiler
 
 BuildCmds= \
-	..\..\Tools_3rd_party\BisonFlex\bison_custom.exe -pAslCompiler -t -d
-v -oAslCompilerDebug/$(InputName).y.c $(InputPath) \
-	move AslCompilerDebug\$(InputName).y.c
AslCompilerDebug\$(InputName)Debug.y.c \
generate/msvc/AslCompiler.dsp +141 -2
-
+	bison -d -pAslCompiler -v $(InputPath) -vd -o$(InputName).y.c
+
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\dtparser.l
+
+!IF  "$(CFG)" == "AslCompiler - Win32 Release"
+
+# Begin Custom Build - Lexing $(InputPath)...
+InputPath=..\..\source\compiler\dtparser.l
+InputName=dtparser
+
+"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -PDtParser -o$(InputName).l.c $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Lexing $(InputPath)...
+InputPath=..\..\source\compiler\dtparser.l
+InputName=dtparser
+
+"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -PDtParser -o$(InputName).l.c $(InputPath)
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\dtparser.y
+
+!IF  "$(CFG)" == "AslCompiler - Win32 Release"
+
+# Begin Custom Build - Yaccing $(InputPath)...
+InputPath=..\..\source\compiler\dtparser.y
+InputName=dtparser
+
+BuildCmds= \
+	bison -d -pDtParser -v $(InputPath) -vd -o$(InputName).y.c
+
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Yaccing $(InputPath)...
+InputPath=..\..\source\compiler\dtparser.y
+InputName=dtparser
+
+BuildCmds= \
+	bison -d -pDtParser -v $(InputPath) -vd -o$(InputName).y.c
+
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prparser.l
+
+!IF  "$(CFG)" == "AslCompiler - Win32 Release"
+
+# Begin Custom Build - Lexing $(InputPath)...
+InputPath=..\..\source\compiler\prparser.l
+InputName=prparser
+
+"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -PPrParser -o$(InputName).l.c $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Lexing $(InputPath)...
+InputPath=..\..\source\compiler\prparser.l
+InputName=prparser
+
+"$(InputName).l.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	flex -PPrParser -o$(InputName).l.c $(InputPath)
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\source\compiler\prparser.y
+
+!IF  "$(CFG)" == "AslCompiler - Win32 Release"
+
+# Begin Custom Build - Yaccing $(InputPath)...
+InputPath=..\..\source\compiler\prparser.y
+InputName=prparser
+
+BuildCmds= \
+	bison -d -pPrParser -v $(InputPath) -vd -o$(InputName).y.c
+
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "AslCompiler - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Yaccing $(InputPath)...
+InputPath=..\..\source\compiler\prparser.y
+InputName=prparser
+
+BuildCmds= \
+	bison -d -pPrParser -v $(InputPath) -vd -o$(InputName).y.c
 
-"AslCompilerDebug/$(InputName)Debug.y.c" : $(SOURCE) "$(INTDIR)"
"$(OUTDIR)"
+"$(InputName).y.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
-"AslCompilerDebug/$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"$(InputName).y.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
    $(BuildCmds)
# End Custom Build
source/compiler/aslcompiler.y +0 -1
index 7191e85..2ed10c1 100644
@@ -141,7 +141,6 @@ void *                      AslLocalAllocate (unsigned
 int Size);
 
 /* Bison/yacc configuration */
 
-#define static
 #undef alloca
 #define alloca              AslLocalAllocate
#define yytname AslCompilername
source/compiler/dtparser.y +7 -0
index c400549..46ef7b2 100644
@@ -120,6 +120,13 @@
 #define _COMPONENT          DT_COMPILER
         ACPI_MODULE_NAME    ("dtparser")
 
+void *                      AslLocalAllocate (unsigned int Size);
+
+/* Bison/yacc configuration */
+
+#undef alloca
+#define alloca              AslLocalAllocate
+
 int                         DtParserlex (void);
 int                         DtParserparse (void);
 void                        DtParsererror (char const *msg);
source/compiler/prparser.y +7 -1
index 2b19713..c2f2150 100644
@@ -120,6 +120,13 @@
 #define _COMPONENT          ASL_PREPROCESSOR
         ACPI_MODULE_NAME    ("prparser")
 
+void *                      AslLocalAllocate (unsigned int Size);
+
+/* Bison/yacc configuration */
+
+#undef alloca
+#define alloca              AslLocalAllocate
+
 int                         PrParserlex (void);
 int                         PrParserparse (void);
 void                        PrParsererror (char const *msg);
--
1.7.10