Skip to content

Commit

Permalink
Add missing source files in build systems
Browse files Browse the repository at this point in the history
  • Loading branch information
TheTumultuousUnicornOfDarkness committed Aug 25, 2024
1 parent a483748 commit ac19636
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 2 deletions.
3 changes: 3 additions & 0 deletions libcpuid/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ libcpuid_la_SOURCES = \
rdtsc.c \
asm-bits.c \
libcpuid_util.c \
rdcpuid.c \
rdmsr.c

if WINDOWS
Expand All @@ -35,13 +36,15 @@ noinst_HEADERS = \
asm-bits.h \
centaur_code_t.h \
intel_code_t.h \
libcpuid_arm_driver.h \
libcpuid_ctype.h \
libcpuid_internal.h \
libcpuid_util.h \
recog_amd.h \
recog_arm.h \
recog_centaur.h \
recog_intel.h \
rdcpuid.h \
rdtsc.h

EXTRA_DIST += libcpuid.sym libcpuid_vc71.vcproj libcpuid_vc10.vcxproj libcpuid_vc10.vcxproj.filters
Expand Down
5 changes: 4 additions & 1 deletion libcpuid/Makefile.x64
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ASM = ml64 /nologo
CC = cl.exe /nologo /TC
OPTFLAGS = /MT
DEFINES = /D "VERSION=\"0.6.5\""
OBJECTS = masm-x64.obj asm-bits.obj cpuid_main.obj libcpuid_util.obj recog_amd.obj recog_arm.obj recog_centaur.obj recog_intel.obj rdtsc.obj
OBJECTS = masm-x64.obj asm-bits.obj cpuid_main.obj libcpuid_util.obj recog_amd.obj recog_arm.obj recog_centaur.obj recog_intel.obj rdcpuid.obj rdtsc.obj

libcpuid.lib: $(OBJECTS)
lib /nologo /MACHINE:AMD64 /out:libcpuid.lib $(OBJECTS) bufferoverflowU.lib
Expand Down Expand Up @@ -35,6 +35,9 @@ recog_centaur.obj: recog_centaur.c
recog_intel.obj: recog_intel.c
$(CC) $(OPTFLAGS) $(DEFINES) /c recog_intel.c

rdcpuid.obj: rdcpuid.c
$(CC) $(OPTFLAGS) $(DEFINES) /c rdcpuid.c

rdtsc.obj: rdtsc.c
$(CC) $(OPTFLAGS) $(DEFINES) /c rdtsc.c

Expand Down
5 changes: 4 additions & 1 deletion libcpuid/Makefile.x86
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ all: libcpuid.lib
CC = cl.exe /nologo /TC
OPTFLAGS = /MT
DEFINES = /D "VERSION=\"0.6.5\""
OBJECTS = asm-bits.obj cpuid_main.obj libcpuid_util.obj recog_amd.obj recog_arm.obj recog_centaur.obj recog_intel.obj rdtsc.obj
OBJECTS = asm-bits.obj cpuid_main.obj libcpuid_util.obj recog_amd.obj recog_arm.obj recog_centaur.obj recog_intel.obj rdcpuid.obj rdtsc.obj

libcpuid.lib: $(OBJECTS)
lib /nologo /out:libcpuid.lib $(OBJECTS)
Expand All @@ -39,6 +39,9 @@ recog_centaur.obj: recog_centaur.c
recog_intel.obj: recog_intel.c
$(CC) $(OPTFLAGS) $(DEFINES) /c recog_intel.c

rdcpuid.obj: rdcpuid.c
$(CC) $(OPTFLAGS) $(DEFINES) /c rdcpuid.c

rdtsc.obj: rdtsc.c
$(CC) $(OPTFLAGS) $(DEFINES) /c rdtsc.c

Expand Down
20 changes: 20 additions & 0 deletions libcpuid/libcpuid.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions libcpuid/libcpuid_vc10.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@
<ClCompile Include="cpuid_main.c" />
<ClCompile Include="libcpuid_util.c" />
<ClCompile Include="msrdriver.c" />
<ClCompile Include="rdcpuid.c" />
<ClCompile Include="rdmsr.c" />
<ClCompile Include="rdtsc.c" />
<ClCompile Include="recog_amd.c" />
Expand All @@ -197,13 +198,17 @@
<ItemGroup>
<ClInclude Include="asm-bits.h" />
<ClInclude Include="libcpuid.h" />
<ClInclude Include="libcpuid_arm_driver.h" />
<ClInclude Include="libcpuid_constants.h" />
<ClInclude Include="libcpuid_ctype.h" />
<ClInclude Include="libcpuid_internal.h" />
<ClInclude Include="libcpuid_types.h" />
<ClInclude Include="libcpuid_util.h" />
<ClInclude Include="recog_amd.h" />
<ClInclude Include="recog_arm.h" />
<ClInclude Include="recog_centaur.h" />
<ClInclude Include="recog_intel.h" />
<ClInclude Include="rdcpuid.h" />
<ClInclude Include="rdtsc.h" />
</ItemGroup>
<ItemGroup>
Expand Down
15 changes: 15 additions & 0 deletions libcpuid/libcpuid_vc10.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
<ClCompile Include="msrdriver.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="rdcpuid.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="rdmsr.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -53,9 +56,18 @@
<ClInclude Include="libcpuid.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libcpuid_arm_driver.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libcpuid_constants.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libcpuid_ctype.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libcpuid_internal.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="libcpuid_types.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand All @@ -74,6 +86,9 @@
<ClInclude Include="recog_intel.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="rdcpuid.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="rdtsc.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down
9 changes: 9 additions & 0 deletions libcpuid/libcpuid_vc71.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@
<File
RelativePath=".\msrdriver.c">
</File>
<File
RelativePath=".\rdcpuid.c">
</File>
<File
RelativePath=".\rdmsr.c">
</File>
Expand Down Expand Up @@ -199,6 +202,9 @@
<File
RelativePath=".\libcpuid.h">
</File>
<File
RelativePath=".\libcpuid_arm_driver.h">
</File>
<File
RelativePath=".\libcpuid_constants.h">
</File>
Expand All @@ -214,6 +220,9 @@
<File
RelativePath=".\libcpuid_util.h">
</File>
<File
RelativePath=".\rdcpuid.h">
</File>
<File
RelativePath=".\rdtsc.h">
</File>
Expand Down

0 comments on commit ac19636

Please sign in to comment.