Skip to content

Commit

Permalink
Fixes by Cheeseh and Ducky
Browse files Browse the repository at this point in the history
  • Loading branch information
APGRoboCop committed Sep 26, 2018
1 parent 0406eda commit 2144a90
Show file tree
Hide file tree
Showing 225 changed files with 88,312 additions and 2,820 deletions.
18 changes: 6 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,15 @@ Note that this is mainly intended for TF2.

## Building
### Windows
Make sure to have Visual Studio 2013 installed.
Other than that, it should compile fine, even with the latest Visual Studio 2017.
Make sure you have Visual Studio 2013 installed.
Other than that it should compile fine, even with the latest Visual Studio 2017.

### Linux
Run ./compile.sh in 'linux_sdk'

Alternatively:
* Go to `linux_sdk`
* Type `make -f Makefile.rcbot2 vcpm`
* Type `make -f Makefile.rcbot2 genmf` (this will generate the Makefiles)
* Edit `Makefile.rcbot2` and `Makefile.HPB_bot2_*` according to your needs
* Most of the time you will only need to modify Line 21 and 55 of `Makefile.rcbot2`
* Type `make -f Makefile.rcbot2 all -j4 2> error.log`
* Check the `error.log`

* `make -f Makefile.rcbot2 vcpm`
* `make -f Makefile.rcbot2 genmf` (this will generate the Makefiles)
* `make -f Makefile.rcbot2 all -j4`
And a `RCBot2Meta_i486.so` should appear in the folder.
---

Make sure to check out the [bots-united.com discord](https://discord.gg/BbxR5wY) for support and to stay updated.
2 changes: 1 addition & 1 deletion linux_sdk/Makefile.HPB_bot2_DebugWin32
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
UTILS_RCBOT2_META_SRC_DIR=../utils/RCBot2_meta
UTILS_RCBOT2_META_OBJ_DIR=obj/$(NAME)_$(ARCH)/utils/RCBot2_meta
UTILS_RCBOT2_META_OBJ_DIR=obj/$(NAME)_$(ARCH)/utilsBot2_metmeta


INCLUDES=-I../utils/RCBot2_meta/../../public/mathlib -I../utils/RCBot2_meta/../../public -I../utils/RCBot2_meta/../../public/engine -I../utils/RCBot2_meta/../../public/tier0 -I../utils/RCBot2_meta/../../public/tier1 -I../utils/RCBot2_meta/../../dlls -I../utils/RCBot2_meta/../../game_shared -I../utils/RCBot2_meta/../../game/shared -I../utils/RCBot2_meta/../../game/server -I../utils/RCBot2_meta/../../public/game/server -I../utils/RCBot2_meta/../mmsource/public -I../utils/RCBot2_meta/../mmsource/core -I../utils/RCBot2_meta/../mmsource/core/sourcehook -D_DEBUG -DHOMEFOLDER
Expand Down
2 changes: 1 addition & 1 deletion linux_sdk/Makefile.HPB_bot2_ReleaseWin32
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
UTILS_RCBOT2_META_SRC_DIR=../utils/RCBot2_meta
UTILS_RCBOT2_META_OBJ_DIR=obj/$(NAME)_$(ARCH)/utils/RCBot2_meta
UTILS_RCBOT2_META_OBJ_DIR=obj/$(NAME)_$(ARCH)/utilsBot2_metmeta


INCLUDES=-I../utils/RCBot2_meta/../../public/mathlib -I../utils/RCBot2_meta/../../public -I../utils/RCBot2_meta/../../public/engine -I../utils/RCBot2_meta/../../public/tier0 -I../utils/RCBot2_meta/../../public/tier1 -I../utils/RCBot2_meta/../../dlls -I../utils/RCBot2_meta/../../game_shared -I../utils/RCBot2_meta/../../game/shared -I../utils/RCBot2_meta/../../game/server -I../utils/RCBot2_meta/../../public/game/server -I../utils/RCBot2_meta/../mmsource/public -I../utils/RCBot2_meta/../mmsource/core -I../utils/RCBot2_meta/../mmsource/core/sourcehook -DNDEBUG -DHOMEFOLDER
Expand Down
2 changes: 1 addition & 1 deletion linux_sdk/Makefile.HPB_bot2_Release_NonHomeFolderWin32
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
UTILS_RCBOT2_META_SRC_DIR=../utils/RCBot2_meta
UTILS_RCBOT2_META_OBJ_DIR=obj/$(NAME)_$(ARCH)/utils/RCBot2_meta
UTILS_RCBOT2_META_OBJ_DIR=obj/$(NAME)_$(ARCH)/utilsBot2_metmeta


INCLUDES=-I../utils/RCBot2_meta/../../public/mathlib -I../utils/RCBot2_meta/../../public -I../utils/RCBot2_meta/../../public/engine -I../utils/RCBot2_meta/../../public/tier0 -I../utils/RCBot2_meta/../../public/tier1 -I../utils/RCBot2_meta/../../dlls -I../utils/RCBot2_meta/../../game_shared -I../utils/RCBot2_meta/../../game/shared -I../utils/RCBot2_meta/../../game/server -I../utils/RCBot2_meta/../../public/game/server -I../utils/RCBot2_meta/../mmsource/public -I../utils/RCBot2_meta/../mmsource/core -I../utils/RCBot2_meta/../mmsource/core/sourcehook -DNDEBUG
Expand Down
10 changes: 5 additions & 5 deletions linux_sdk/Makefile.rcbot2
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
# the name of the mod binary (_i486.so is appended to the end)
#NAME=server
#NAME=HPB_bot2_meta
#NAME=RCBot2Meta
NAME=RCBot2MetaDebug
NAME=RCBot2Meta
#NAME=RCBot2MetaDebug

# the location of the vcproj that builds the mod
#MOD_PROJ=../game/server/server_hl2mp-2005.vcproj
MOD_PROJ=../utils/RCBot2_meta/HPB_Bot2.vcproj

# the name of the mod configuration (typically <proj name>_<build type><build target>)
#MOD_CONFIG=ServerHL2MP_ReleaseWin32
#MOD_CONFIG=HPB_bot2_Release_NonHomeFolderWin32
MOD_CONFIG=HPB_bot2_DebugWin32
MOD_CONFIG=HPB_bot2_Release_NonHomeFolderWin32
#MOD_CONFIG=HPB_bot2_DebugWin32

# the directory the base binaries (tier0_i486.so, etc) are located
# this should point to your orange box subfolder of where you have srcds installed.
Expand Down Expand Up @@ -52,7 +52,7 @@ CLINK=/usr/bin/gcc-4.8
OPTFLAGS=-O1 -fomit-frame-pointer -fforce-addr -fthread-jumps -fcrossjumping -foptimize-sibling-calls -fcse-follow-jumps -fcse-skip-blocks -fgcse -fgcse-lm -frerun-cse-after-loop -fcaller-saves -fpeephole2 -fschedule-insns2 -fsched-interblock -fsched-spec -fregmove -fdelete-null-pointer-checks -freorder-blocks -freorder-functions -falign-functions -falign-jumps -falign-loops -falign-labels -ftree-vrp -ftree-pre -finline-functions -funswitch-loops -fgcse-after-reload -funsafe-math-optimizations

# put any compiler flags you want passed here
USER_CFLAGS= -std=c++11 -w -D__linux__ -g -D_DEBUG -DDEBUG -DSH_DEBUG# -DTF2_HOOKS
USER_CFLAGS= -std=c++11 -w -D__linux# -g -D_DEBUG -DDEBUG -DSH_DEBUG# -DTF2_HOOKS

# Link Libraries
#LIBFILES= \
Expand Down
Binary file modified linux_sdk/vcpm
Binary file not shown.

0 comments on commit 2144a90

Please sign in to comment.