Examples: Update makefiles and project files.

Update for recent changes to the example ACPICA code.
This commit is contained in:
Robert Moore 2013-12-13 14:19:26 -08:00
parent d3e8023230
commit da63493b97
5 changed files with 601 additions and 49 deletions

View File

@ -16,9 +16,6 @@ EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AslCompiler", "AslCompiler.vcproj", "{567F2240-BCAA-48BE-BAB8-4E812BD273D8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Examples", "Examples.vcproj", "{D086AEFC-5004-4D97-B68B-F884F7C75436}"
ProjectSection(ProjectDependencies) = postProject
{2B403FFB-5AFB-48D8-8C13-F8E65CEC5BB6} = {2B403FFB-5AFB-48D8-8C13-F8E65CEC5BB6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AcpiNames", "AcpiNames.vcproj", "{3CA2F53C-7566-40B0-B945-711788EDCD8C}"
EndProject

View File

@ -46,7 +46,7 @@
UseUnicodeResponseFiles="false"
Optimization="0"
AdditionalIncludeDirectories="..\..\source\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ACPI_APPLICATION;ACPI_SINGLE_THREADED"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;ACPI_EXAMPLE_APP"
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="0"
@ -78,7 +78,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="..\..\libraries\acpica_dbg.lib odbc32.lib odbccp32.lib"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile=".\ExamplesDebug\Examples.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -152,7 +152,7 @@
InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="..\..\source\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ACPI_APPLICATION;ACPI_SINGLE_THREADED"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ACPI_EXAMPLE_APP"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="0"
@ -182,7 +182,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="../../libraries\acpica_dbg.lib odbc32.lib odbccp32.lib"
AdditionalDependencies="odbc32.lib odbccp32.lib"
OutputFile=".\Examples\Examples.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@ -229,57 +229,455 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\source\tools\examples\examples.c"
<Filter
Name="Common"
>
<FileConfiguration
Name="Debug|Win32"
<File
RelativePath="..\..\source\os_specific\service_layers\oswinxf.c"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\source\os_specific\service_layers\oswinxf.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="Examples"
>
<FileConfiguration
Name="Debug|Win32"
<File
RelativePath="..\..\source\tools\examples\examples.c"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
DisableLanguageExtensions="false"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
</File>
<File
RelativePath="..\..\source\tools\examples\exstubs.c"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
DisableLanguageExtensions="false"
/>
</FileConfiguration>
</File>
</File>
<File
RelativePath="..\..\source\tools\examples\extables.c"
>
</File>
</Filter>
<Filter
Name="Utilities"
>
<File
RelativePath="..\..\source\components\utilities\utaddress.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utalloc.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utbuffer.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utcache.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utcopy.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utdecode.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utdelete.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\uterror.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utexcep.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utglobal.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utlock.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utmath.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utmisc.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utmutex.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utobject.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utosi.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utownerid.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utstate.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utstring.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utxface.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utxferror.c"
>
</File>
<File
RelativePath="..\..\source\components\utilities\utxfinit.c"
>
</File>
</Filter>
<Filter
Name="Tables"
>
<File
RelativePath="..\..\source\components\tables\tbfadt.c"
>
</File>
<File
RelativePath="..\..\source\components\tables\tbfind.c"
>
</File>
<File
RelativePath="..\..\source\components\tables\tbinstal.c"
>
</File>
<File
RelativePath="..\..\source\components\tables\tbprint.c"
>
</File>
<File
RelativePath="..\..\source\components\tables\tbutils.c"
>
</File>
<File
RelativePath="..\..\source\components\tables\tbxface.c"
>
</File>
<File
RelativePath="..\..\source\components\tables\tbxfload.c"
>
</File>
<File
RelativePath="..\..\source\components\tables\tbxfroot.c"
>
</File>
</Filter>
<Filter
Name="Namespace"
>
<File
RelativePath="..\..\source\components\namespace\nsaccess.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsalloc.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsdump.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nseval.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsinit.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsload.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsnames.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsobject.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsparse.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nssearch.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsutils.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nswalk.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsxfeval.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsxfname.c"
>
</File>
<File
RelativePath="..\..\source\components\namespace\nsxfobj.c"
>
</File>
</Filter>
<Filter
Name="Parser"
>
<File
RelativePath="..\..\source\components\parser\psargs.c"
>
</File>
<File
RelativePath="..\..\source\components\parser\psloop.c"
>
</File>
<File
RelativePath="..\..\source\components\parser\psobject.c"
>
</File>
<File
RelativePath="..\..\source\components\parser\psopcode.c"
>
</File>
<File
RelativePath="..\..\source\components\parser\psopinfo.c"
>
</File>
<File
RelativePath="..\..\source\components\parser\psparse.c"
>
</File>
<File
RelativePath="..\..\source\components\parser\psscope.c"
>
</File>
<File
RelativePath="..\..\source\components\parser\pstree.c"
>
</File>
<File
RelativePath="..\..\source\components\parser\psutils.c"
>
</File>
<File
RelativePath="..\..\source\components\parser\pswalk.c"
>
</File>
<File
RelativePath="..\..\source\components\parser\psxface.c"
>
</File>
</Filter>
<Filter
Name="Interpreter"
>
<File
RelativePath="..\..\source\components\executer\exconfig.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exconvrt.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\excreate.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exdebug.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exdump.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exfield.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exfldio.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exmisc.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exmutex.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exnames.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exoparg1.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exoparg2.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exoparg3.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exoparg6.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exprep.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exregion.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exresnte.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exresolv.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exresop.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exstore.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exstoren.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exstorob.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exsystem.c"
>
</File>
<File
RelativePath="..\..\source\components\executer\exutils.c"
>
</File>
</Filter>
<Filter
Name="Dispatcher"
>
<File
RelativePath="..\..\source\components\dispatcher\dsargs.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dscontrol.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dsfield.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dsinit.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dsmethod.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dsmthdat.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dsobject.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dsopcode.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dsutils.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dswexec.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dswload.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dswload2.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dswscope.c"
>
</File>
<File
RelativePath="..\..\source\components\dispatcher\dswstate.c"
>
</File>
</Filter>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath="..\..\source\tools\examples\examples.h"
>
</File>
</Filter>
</Files>
<Globals>

View File

@ -297,6 +297,14 @@
>
</File>
</Filter>
<Filter
Name="AcpiExamples"
>
<File
RelativePath="..\unix\acpiexamples\Makefile"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>

View File

@ -33,7 +33,7 @@
# not be necessary to change it.
#
.SUFFIXES :
PROGS = acpibin acpidump acpiexec acpihelp acpinames acpisrc acpixtract iasl
PROGS = acpibin acpidump acpiexamples acpiexec acpihelp acpinames acpisrc acpixtract iasl
HOST ?= _CYGWIN
CC = gcc
@ -102,6 +102,7 @@ ACPICA_UTILITIES = $(ACPICA_CORE)/utilities
#
ACPIBIN = $(ACPICA_TOOLS)/acpibin
ACPIDUMP = $(ACPICA_TOOLS)/acpidump
ACPIEXAMPLES = $(ACPICA_TOOLS)/examples
ACPIEXEC = $(ACPICA_TOOLS)/acpiexec
ACPIHELP = $(ACPICA_TOOLS)/acpihelp
ACPINAMES = $(ACPICA_TOOLS)/acpinames

View File

@ -0,0 +1,148 @@
#
# acpiexamples - Example ACPICA initialization code and control
# method execution.
#
#
# 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)/acpiexamples
PROG = $(OBJDIR)/acpiexamples
#
# Search paths for source files
#
vpath %.c \
$(ACPIEXAMPLES)\
$(ACPICA_DEBUGGER)\
$(ACPICA_DISPATCHER)\
$(ACPICA_EXECUTER)\
$(ACPICA_NAMESPACE)\
$(ACPICA_PARSER)\
$(ACPICA_TABLES)\
$(ACPICA_UTILITIES)\
$(ACPICA_COMMON)\
$(ACPICA_OSL)
HEADERS = \
$(wildcard $(ACPIEXAMPLES)/*.h)
OBJECTS = \
$(OBJDIR)/examples.o\
$(OBJDIR)/exstubs.o\
$(OBJDIR)/extables.o\
$(OBJDIR)/dsargs.o\
$(OBJDIR)/dscontrol.o\
$(OBJDIR)/dsfield.o\
$(OBJDIR)/dsinit.o\
$(OBJDIR)/dsmethod.o\
$(OBJDIR)/dsmthdat.o\
$(OBJDIR)/dsobject.o\
$(OBJDIR)/dsopcode.o\
$(OBJDIR)/dsutils.o\
$(OBJDIR)/dswexec.o\
$(OBJDIR)/dswload.o\
$(OBJDIR)/dswload2.o\
$(OBJDIR)/dswscope.o\
$(OBJDIR)/dswstate.o\
$(OBJDIR)/exconfig.o\
$(OBJDIR)/exconvrt.o\
$(OBJDIR)/excreate.o\
$(OBJDIR)/exdebug.o\
$(OBJDIR)/exdump.o\
$(OBJDIR)/exfield.o\
$(OBJDIR)/exfldio.o\
$(OBJDIR)/exmisc.o\
$(OBJDIR)/exmutex.o\
$(OBJDIR)/exnames.o\
$(OBJDIR)/exoparg1.o\
$(OBJDIR)/exoparg2.o\
$(OBJDIR)/exoparg3.o\
$(OBJDIR)/exoparg6.o\
$(OBJDIR)/exprep.o\
$(OBJDIR)/exregion.o\
$(OBJDIR)/exresnte.o\
$(OBJDIR)/exresolv.o\
$(OBJDIR)/exresop.o\
$(OBJDIR)/exstore.o\
$(OBJDIR)/exstoren.o\
$(OBJDIR)/exstorob.o\
$(OBJDIR)/exsystem.o\
$(OBJDIR)/exutils.o\
$(OBJDIR)/nsaccess.o\
$(OBJDIR)/nsalloc.o\
$(OBJDIR)/nsconvert.o\
$(OBJDIR)/nsdump.o\
$(OBJDIR)/nseval.o\
$(OBJDIR)/nsinit.o\
$(OBJDIR)/nsload.o\
$(OBJDIR)/nsnames.o\
$(OBJDIR)/nsobject.o\
$(OBJDIR)/nsparse.o\
$(OBJDIR)/nssearch.o\
$(OBJDIR)/nsutils.o\
$(OBJDIR)/nswalk.o\
$(OBJDIR)/nsxfeval.o\
$(OBJDIR)/nsxfname.o\
$(OBJDIR)/nsxfobj.o\
$(OBJDIR)/osunixxf.o\
$(OBJDIR)/psargs.o\
$(OBJDIR)/psloop.o\
$(OBJDIR)/psobject.o\
$(OBJDIR)/psopcode.o\
$(OBJDIR)/psopinfo.o\
$(OBJDIR)/psparse.o\
$(OBJDIR)/psscope.o\
$(OBJDIR)/pstree.o\
$(OBJDIR)/psutils.o\
$(OBJDIR)/pswalk.o\
$(OBJDIR)/psxface.o\
$(OBJDIR)/tbfadt.o\
$(OBJDIR)/tbfind.o\
$(OBJDIR)/tbinstal.o\
$(OBJDIR)/tbprint.o\
$(OBJDIR)/tbutils.o\
$(OBJDIR)/tbxface.o\
$(OBJDIR)/tbxfload.o\
$(OBJDIR)/tbxfroot.o\
$(OBJDIR)/utaddress.o\
$(OBJDIR)/utalloc.o\
$(OBJDIR)/utbuffer.o\
$(OBJDIR)/utcache.o\
$(OBJDIR)/utcopy.o\
$(OBJDIR)/utdebug.o\
$(OBJDIR)/utdecode.o\
$(OBJDIR)/utdelete.o\
$(OBJDIR)/uterror.o\
$(OBJDIR)/utexcep.o\
$(OBJDIR)/utglobal.o\
$(OBJDIR)/utlock.o\
$(OBJDIR)/utmath.o\
$(OBJDIR)/utmisc.o\
$(OBJDIR)/utmutex.o\
$(OBJDIR)/utobject.o\
$(OBJDIR)/utosi.o\
$(OBJDIR)/utownerid.o\
$(OBJDIR)/utstate.o\
$(OBJDIR)/utstring.o\
$(OBJDIR)/utxface.o\
$(OBJDIR)/utxferror.o\
$(OBJDIR)/utxfinit.o
#
# Flags specific to acpinames utility
#
CFLAGS += \
-DACPI_EXAMPLE_APP\
-I$(EXAMPLES)
#
# Common Rules
#
include ../Makefile.rules