mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
Move TOOLS/cpuinfo.c into the root directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22950 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
8070c8959d
commit
bf3fff69ca
2
Makefile
2
Makefile
@ -311,7 +311,7 @@ dep depend: help_mp.h version.h codecs.conf.h
|
||||
clean:
|
||||
-rm -f *.o *.a *~
|
||||
-rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \
|
||||
codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \
|
||||
codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo(EXESUF) \
|
||||
codecs.conf.h help_mp.h version.h
|
||||
@for a in $(PARTS); do $(MAKE) -C $$a clean; done
|
||||
|
||||
|
@ -71,5 +71,5 @@ netstream: netstream.o $(NETSTREAM_DEPS)
|
||||
clean distclean:
|
||||
rm -f *.o *~ $(OBJS)
|
||||
rm -f fastmem-* fastmem2-* fastmemcpybench netstream
|
||||
rm -f cpuinfo$(EXESUF) bmovl-test$(EXESUF) vfw2menc$(EXESUF)
|
||||
rm -f bmovl-test$(EXESUF) vfw2menc$(EXESUF)
|
||||
rm -f $(REAL_TARGETS)
|
||||
|
6
configure
vendored
6
configure
vendored
@ -1485,9 +1485,9 @@ elif aix; then
|
||||
_cpuinfo="lsattr -E -l proc0 -a type"
|
||||
elif x86; then
|
||||
# all other OSes try to extract CPU information from a small helper
|
||||
# program TOOLS/cpuinfo instead
|
||||
$_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
|
||||
_cpuinfo="TOOLS/cpuinfo"
|
||||
# program cpuinfo instead
|
||||
$_cc -o cpuinfo cpuinfo.c
|
||||
_cpuinfo="./cpuinfo"
|
||||
fi
|
||||
|
||||
if x86 ; then
|
||||
|
Loading…
Reference in New Issue
Block a user