mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-01-28 04:05:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update makefiles and project files for new acpidump utility.

Browse Source 
Add acpidump utility.
This commit is contained in:
Robert Moore 2013-05-02 09:32:44 -07:00
parent 15215bf87d
commit 1cf06395c0
6 changed files with 414 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -35,6 +35,8 @@ generate/msvc9/*.aps
generate/msvc9/*.rc
generate/msvc9/AcpiBin
generate/msvc9/AcpiBinDebug
generate/msvc9/AcpiDump
generate/msvc9/AcpiDumpDebug
generate/msvc9/AcpiSrc
generate/msvc9/AcpiSrcDebug
generate/msvc9/AcpiSubsystem
@ -68,6 +70,8 @@ generate/unix/bin32
generate/unix/bin64
generate/unix/acpibin/obj32
generate/unix/acpibin/obj64
generate/unix/acpidump/obj32
generate/unix/acpidump/obj64
generate/unix/acpiexec/obj32
generate/unix/acpiexec/obj64
generate/unix/acpihelp/obj32

6
generate/msvc9/AcpiComponents.sln
View File

@ -28,6 +28,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Makefiles", "Makefiles.vcpr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scripts", "Scripts.vcproj", "{50B1F35B-91C8-478F-8BA0-F409BA1BA69B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AcpiDump", "AcpiDump.vcproj", "{120C599E-9399-4D80-836A-2980B214CBA0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -78,6 +80,10 @@ Global
{762CF0FE-FDDC-46CC-ABBC-36A08B81920D}.Release|Win32.ActiveCfg = Release|Win32
{50B1F35B-91C8-478F-8BA0-F409BA1BA69B}.Debug|Win32.ActiveCfg = Debug|Win32
{50B1F35B-91C8-478F-8BA0-F409BA1BA69B}.Release|Win32.ActiveCfg = Release|Win32
{120C599E-9399-4D80-836A-2980B214CBA0}.Debug|Win32.ActiveCfg = Debug|Win32
{120C599E-9399-4D80-836A-2980B214CBA0}.Debug|Win32.Build.0 = Debug|Win32
{120C599E-9399-4D80-836A-2980B214CBA0}.Release|Win32.ActiveCfg = Release|Win32
{120C599E-9399-4D80-836A-2980B214CBA0}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

341
generate/msvc9/AcpiDump.vcproj Executable file
View File

@ -0,0 +1,341 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="AcpiDump"
ProjectGUID="{120C599E-9399-4D80-836A-2980B214CBA0}"
RootNamespace="AcpiDump"
TargetFrameworkVersion="0"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\AcpiDumpDebug"
IntermediateDirectory=".\AcpiDumpDebug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName="\acpica/generate/msvc/AcpiDumpDebug/AcpiDump.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
Optimization="0"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\source\include"
PreprocessorDefinitions="ACPI_DUMP_APP;_DEBUG;WIN32;_CONSOLE"
StringPooling="true"
ExceptionHandling="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
DisableLanguageExtensions="true"
PrecompiledHeaderFile=".\AcpiDumpDebug\AcpiDump.pch"
AssemblerListingLocation=".\AcpiDumpDebug\"
ObjectFile=".\AcpiDumpDebug\"
ProgramDataBaseFileName=".\AcpiDumpDebug\"
BrowseInformation="1"
WarningLevel="4"
SuppressStartupBanner="true"
DebugInformationFormat="3"
CallingConvention="1"
CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
CommandLine="if NOT EXIST ..\..\libraries mkdir ..\..\libraries"
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/out:&quot;.\AcpiDumpDebug\AcpiDump.exe&quot;"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile=".\AcpiDumpDebug/AcpiDump.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\AcpiDumpDebug\AcpiDump.pdb"
GenerateMapFile="true"
MapFileName=".\AcpiDumpDebug\AcpiDump.map"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile="$(IntDir)\"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copy AcpiDumpDebug.exe to Libraries (DEBUG)"
CommandLine="copy .\AcpiDumpdebug\AcpiDump.exe ..\..\libraries\AcpiDumpDebug.exe&#x0D;&#x0A;dir ..\..\libraries\AcpiDumpdebug.exe&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\AcpiDump"
IntermediateDirectory=".\AcpiDump"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName="\acpica/generate/msvc/AcpiDump/AcpiDump.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
UseUnicodeResponseFiles="false"
Optimization="2"
InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\..\source\include"
PreprocessorDefinitions="ACPI_DUMP_APP;NDEBUG;WIN32;_CONSOLE"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
DisableLanguageExtensions="true"
PrecompiledHeaderFile=".\AcpiDump\AcpiDump.pch"
AssemblerListingLocation=".\AcpiDump\"
ObjectFile=".\AcpiDump\"
ProgramDataBaseFileName=".\AcpiDump\"
BrowseInformation="1"
WarningLevel="4"
SuppressStartupBanner="true"
CallingConvention="1"
CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
CommandLine="if NOT EXIST ..\..\libraries mkdir ..\..\libraries"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile=".\AcpiDump\AcpiDump.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="advapi32.lib"
ProgramDatabaseFile=".\AcpiDump\AcpiDump.pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile="$(IntDir)\"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copy AcpiDump.exe to Libraries"
CommandLine="copy .\AcpiDump\AcpiDump.exe ..\..\libraries\AcpiDump.exe&#x0D;&#x0A;dir ..\..\libraries\AcpiDump.exe&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<Filter
Name="AcpiDump"
>
<File
RelativePath="..\..\source\tools\acpidump\apdump.c"
>
</File>
<File
RelativePath="..\..\source\tools\acpidump\apfiles.c"
>
</File>
<File
RelativePath="..\..\source\tools\acpidump\apmain.c"
>
</File>
</Filter>
<Filter
Name="Common"
>
<File
RelativePath="..\..\source\Common\getopt.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\source\os_specific\service_layers\oswintbl.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="false"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
DisableLanguageExtensions="false"
/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="Utilities"
Filter=".c"
>
<File
RelativePath="..\..\source\components\utilities\utbuffer.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utexcep.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utmath.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utstring.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utxferror.c"
>
</File>
</Filter>
<Filter
Name="Tables"
>
<File
RelativePath="..\..\source\components\tables\tbprint.c"
>
</File>
</Filter>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath="..\..\source\tools\acpidump\acpidump.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

8
generate/msvc9/Makefiles.vcproj
View File

@ -289,6 +289,14 @@
>
</File>
</Filter>
<Filter
Name="AcpiDump"
>
<File
RelativePath="..\unix\acpidump\Makefile"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>

3
generate/unix/Makefile.config
View File

@ -29,7 +29,7 @@
# used will not be recognized.
#
.SUFFIXES :
PROGS = acpibin acpiexec acpihelp acpinames acpisrc acpixtract iasl
PROGS = acpibin acpidump acpiexec acpihelp acpinames acpisrc acpixtract iasl
HOST = _CYGWIN
CC = gcc
@ -86,6 +86,7 @@ ACPICA_UTILITIES = $(ACPICA_CORE)/utilities
# ACPICA tool and utility source directories
#
ACPIBIN = $(ACPICA_TOOLS)/acpibin
ACPIDUMP = $(ACPICA_TOOLS)/acpidump
ACPIEXEC = $(ACPICA_TOOLS)/acpiexec
ACPIHELP = $(ACPICA_TOOLS)/acpihelp
ACPINAMES = $(ACPICA_TOOLS)/acpinames

53
generate/unix/acpidump/Makefile Normal file
View File

@ -0,0 +1,53 @@
#
# acpidump - ACPI table dump utility (binary to ascii hex)
#
#
# Note: This makefile is intended to be used from within the native
# ACPICA directory structure, from under generate/unix. It specifically
# places all object files in a generate/unix subdirectory, not within
# the various ACPICA source directories. This prevents collisions
# between different compilations of the same source file with different
# compile options, and prevents pollution of the source code.
#
include ../Makefile.config
FINAL_PROG = ../$(BINDIR)/acpidump
PROG = $(OBJDIR)/acpidump
#
# Search paths for source files
#
vpath %.c \
$(ACPIDUMP)\
$(ACPICA_TABLES)\
$(ACPICA_UTILITIES)\
$(ACPICA_COMMON)\
$(ACPICA_OSL)
HEADERS = \
$(wildcard $(ACPIDUMP)/*.h)
OBJECTS = \
$(OBJDIR)/apdump.o\
$(OBJDIR)/apfiles.o\
$(OBJDIR)/apmain.o\
$(OBJDIR)/tbprint.o\
$(OBJDIR)/utbuffer.o\
$(OBJDIR)/utexcep.o\
$(OBJDIR)/utmath.o\
$(OBJDIR)/utstring.o\
$(OBJDIR)/utxferror.o\
$(OBJDIR)/oslinuxtbl.o\
$(OBJDIR)/getopt.o
#
# Flags specific to acpidump
#
CFLAGS += \
-DACPI_DUMP_APP\
-I$(ACPIDUMP)
#
# Common Rules
#
include ../Makefile.rules