Skip to content

Commit

Permalink
Minor house keeping
Browse files Browse the repository at this point in the history
  • Loading branch information
FriskTheFallenHuman committed Dec 14, 2024
1 parent a99a50d commit 5533118
Show file tree
Hide file tree
Showing 14 changed files with 80 additions and 251 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -1051,8 +1051,8 @@ neo/libs/MayaSDKDevKit/*
docs/html/*

# Doom 3: Build directory & log directory
buildlog/
build*/
build/
output/*/*

# Doom 3: Ignore PK4 & Keys
config.spec
Expand Down
25 changes: 0 additions & 25 deletions neo/cmake-linux-debug.sh

This file was deleted.

25 changes: 0 additions & 25 deletions neo/cmake-linux-release.sh

This file was deleted.

25 changes: 0 additions & 25 deletions neo/cmake-linux-retail.sh

This file was deleted.

43 changes: 0 additions & 43 deletions neo/cmake-vs2022.bat

This file was deleted.

32 changes: 0 additions & 32 deletions neo/cmake-win-ninja-debug-x64.bat

This file was deleted.

32 changes: 0 additions & 32 deletions neo/cmake-win-ninja-debug-x86.bat

This file was deleted.

33 changes: 0 additions & 33 deletions neo/cmake-win-ninja-release-x64.bat

This file was deleted.

32 changes: 0 additions & 32 deletions neo/cmake-win-ninja-release-x86.bat

This file was deleted.

60 changes: 60 additions & 0 deletions neo/cmake_linux.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/bin/sh

BUILD_DIR=build/gcc/debug
DIRECTORY="gcc"
BUILDTYPE="debug"
CMAKE_BUILD_TYPE="Debug"
CMAKE_GENERATOR="Sublime Text 2 - Unix Makefiles"

if [ "$#" -ne "2" ]; then
echo "Usage cmake_linux.sh <gcc|clang|clang-libc++> <debug|release|reldeb>"
exit 1
fi

if [ "$#" -ge "1" ]; then

if [ "$1" = "gcc" ]; then
export CXX="g++"
export CC="gcc"
DIRECTORY="gcc"
fi

if [ "$1" = "clang" ]; then
export CXX="clang++"
export CC="clang"
DIRECTORY="clang"
CMAKE_CXX_FLAGS="-stdlib=libstdc++"
fi

if [ "$1" = "clang-libc++" ]; then
export CXX="clang++"
export CC="clang"
DIRECTORY="clang-libc++"
CMAKE_CXX_FLAGS="-stdlib=libc++"
fi
fi

if [ "$#" -ge "2" ]; then

if [ "$2" = "debug" ]; then
BUILDTYPE="debug"
CMAKE_BUILD_TYPE="Debug"
fi

if [ "$2" = "release" ]; then
BUILDTYPE="release"
CMAKE_BUILD_TYPE="Release"
fi

if [ "$2" = "reldeb" ]; then
BUILDTYPE="relwithdebinfo"
CMAKE_BUILD_TYPE="relwithdebinfo"
fi
fi

BUILDDIR=build/$DIRECTORY/$BUILDTYPE

mkdir -p $BUILDDIR
cd $BUILDDIR

cmake -G"$CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" ../../..
7 changes: 7 additions & 0 deletions neo/cmake_msvc2019.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@echo off
cls
mkdir build\msvc2019-x86
pushd build\msvc2019-x86
cmake -G "Visual Studio 16" %* ../..
popd
@pause
7 changes: 7 additions & 0 deletions neo/cmake_msvc2022.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@echo off
cls
mkdir build\msvc2022-x86
pushd build\msvc2022-x86
cmake -G "Visual Studio 17" %* ../..
popd
@pause
4 changes: 3 additions & 1 deletion neo/renderer/tr_font.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -365,10 +365,12 @@ bool idRenderSystemLocal::RegisterFont( const char *fontName, fontInfoEx_t &font
glyphInfo_t *glyph;
const idMaterial *h;
float max;
#endif // ID_BUILD_FREETYPE
void *faceData;
ID_TIME_T ftime;
int i, len, fontCount;
#else
int fontCount;
#endif // ID_BUILD_FREETYPE
idStr name;
float dpi = 72;
int pointSize = 12;
Expand Down
2 changes: 1 addition & 1 deletion vcpkg
Submodule vcpkg updated 4294 files

0 comments on commit 5533118

Please sign in to comment.