[v0.24] Merge bugfix branch
This commit is contained in:
@@ -45,6 +45,8 @@ if(NOT ${PCIUTILS_FOUND})
|
|||||||
else()
|
else()
|
||||||
include_directories(${PCIUTILS_INCLUDE_DIR})
|
include_directories(${PCIUTILS_INCLUDE_DIR})
|
||||||
link_libraries(${PCIUTILS_LIBRARIES})
|
link_libraries(${PCIUTILS_LIBRARIES})
|
||||||
|
# Needed for linking libpci in FreeBSD
|
||||||
|
link_directories(/usr/local/lib/)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_executable(gpufetch ${COMMON_DIR}/main.cpp ${COMMON_DIR}/args.cpp ${COMMON_DIR}/gpu.cpp ${COMMON_DIR}/pci.cpp ${COMMON_DIR}/sort.cpp ${COMMON_DIR}/global.cpp ${COMMON_DIR}/printer.cpp ${COMMON_DIR}/master.cpp ${COMMON_DIR}/uarch.cpp)
|
add_executable(gpufetch ${COMMON_DIR}/main.cpp ${COMMON_DIR}/args.cpp ${COMMON_DIR}/gpu.cpp ${COMMON_DIR}/pci.cpp ${COMMON_DIR}/sort.cpp ${COMMON_DIR}/global.cpp ${COMMON_DIR}/printer.cpp ${COMMON_DIR}/master.cpp ${COMMON_DIR}/uarch.cpp)
|
||||||
|
|||||||
11
build.sh
11
build.sh
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/sh
|
||||||
|
|
||||||
# gpufetch build script
|
# gpufetch build script
|
||||||
set -e
|
set -e
|
||||||
@@ -27,6 +27,13 @@ fi
|
|||||||
# cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_INTEL_BACKEND=OFF ..
|
# cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_INTEL_BACKEND=OFF ..
|
||||||
|
|
||||||
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
|
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
|
||||||
make -j$(nproc)
|
|
||||||
|
os=$(uname)
|
||||||
|
if [ "$os" == 'Linux' ]; then
|
||||||
|
make -j$(nproc)
|
||||||
|
elif [ "$os" == 'FreeBSD' ]; then
|
||||||
|
gmake -j4
|
||||||
|
fi
|
||||||
|
|
||||||
cd -
|
cd -
|
||||||
ln -s build/gpufetch .
|
ln -s build/gpufetch .
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
#ifndef __ARGS__
|
#ifndef __ARGS__
|
||||||
#define __ARGS__
|
#define __ARGS__
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
struct color {
|
struct color {
|
||||||
int32_t R;
|
int32_t R;
|
||||||
int32_t G;
|
int32_t G;
|
||||||
|
|||||||
Reference in New Issue
Block a user