mirror of
https://github.com/YGGverse/hlsdk-portable.git
synced 2025-02-03 10:35:42 +00:00
Merge branch 'master' into travis
This commit is contained in:
commit
20016e330b
10
.gitignore
vendored
10
.gitignore
vendored
@ -6,4 +6,14 @@
|
|||||||
*.a
|
*.a
|
||||||
*.framework
|
*.framework
|
||||||
*.exe
|
*.exe
|
||||||
|
*.dll
|
||||||
|
*.pdb
|
||||||
build/
|
build/
|
||||||
|
CMakeLists.txt.user
|
||||||
|
cmake_install.cmake
|
||||||
|
*.orig
|
||||||
|
*.cbp
|
||||||
|
*.dsw
|
||||||
|
*.vsxproj
|
||||||
|
*.vsproj
|
||||||
|
*.sln
|
||||||
|
@ -32,6 +32,10 @@ option(USE_VOICEMGR "Enable VOICE MANAGER." OFF)
|
|||||||
option(BUILD_CLIENT "Build client dll" ON)
|
option(BUILD_CLIENT "Build client dll" ON)
|
||||||
option(BUILD_SERVER "Build server dll" ON)
|
option(BUILD_SERVER "Build server dll" ON)
|
||||||
option(GOLDSOURCE_SUPPORT "Build goldsource compatible client library" OFF)
|
option(GOLDSOURCE_SUPPORT "Build goldsource compatible client library" OFF)
|
||||||
|
set(GAMEDIR "valve" CACHE STRING "Gamedir path")
|
||||||
|
set(SERVER_INSTALL_DIR "dlls" CACHE STRING "Where put server dll")
|
||||||
|
set(CLIENT_INSTALL_DIR "cl_dlls" CACHE STRING "Where put client dll")
|
||||||
|
set(SERVER_LIBRARY_NAME "hl" CACHE STRING "Library name for Linux/MacOS/Windows")
|
||||||
|
|
||||||
#-----------------
|
#-----------------
|
||||||
# MAIN BUILD CODE \
|
# MAIN BUILD CODE \
|
||||||
|
31
backup.bat
31
backup.bat
@ -1,31 +0,0 @@
|
|||||||
@echo off
|
|
||||||
color 4F
|
|
||||||
echo XashXT Group 2006 (C)
|
|
||||||
echo Prepare source for backup
|
|
||||||
echo.
|
|
||||||
|
|
||||||
if exist backup.log del /f /q backup.log
|
|
||||||
if not exist D:\!backup/ mkdir D:\!backup\
|
|
||||||
echo Prepare OK!
|
|
||||||
echo Please wait: backup in progress
|
|
||||||
C:\Progra~1\WinRar\rar a -agMMMYYYY-DD D:\!backup\.rar -dh -m5 @backup.lst >>backup.log
|
|
||||||
if errorlevel 1 goto error
|
|
||||||
if errorlevel 0 goto ok
|
|
||||||
:ok
|
|
||||||
cls
|
|
||||||
echo Source was sucessfully backuped
|
|
||||||
echo and stored in folder "backup"
|
|
||||||
echo Press any key for exit. :-)
|
|
||||||
if exist backup.log del /f /q backup.log
|
|
||||||
exit
|
|
||||||
:error
|
|
||||||
echo ******************************
|
|
||||||
echo ***********Error!*************
|
|
||||||
echo ******************************
|
|
||||||
echo **See backup.log for details**
|
|
||||||
echo ******************************
|
|
||||||
echo ******************************
|
|
||||||
echo.
|
|
||||||
echo press any key for exit :-(
|
|
||||||
pause>nul
|
|
||||||
exit
|
|
36
backup.lst
36
backup.lst
@ -1,36 +0,0 @@
|
|||||||
//=======================================================================
|
|
||||||
// Copyright XashXT Group 2007 ©
|
|
||||||
// list with backup directories
|
|
||||||
//=======================================================================
|
|
||||||
|
|
||||||
// global stuff
|
|
||||||
xash.dsw
|
|
||||||
debug.bat
|
|
||||||
backup.lst
|
|
||||||
backup.bat
|
|
||||||
release.bat
|
|
||||||
change.log
|
|
||||||
make_sdk.bat
|
|
||||||
xash_sdk.lst
|
|
||||||
|
|
||||||
cl_dll\
|
|
||||||
cl_dll\hl\
|
|
||||||
common\
|
|
||||||
dlls\
|
|
||||||
game_shared\
|
|
||||||
game_launch\
|
|
||||||
engine\
|
|
||||||
engine\client\
|
|
||||||
engine\client\vgui\
|
|
||||||
engine\server\
|
|
||||||
engine\common\
|
|
||||||
engine\common\imagelib\
|
|
||||||
engine\common\soundlib\
|
|
||||||
pm_shared\
|
|
||||||
mainui\
|
|
||||||
mainui\legacy
|
|
||||||
utils\
|
|
||||||
utils\makefont\
|
|
||||||
utils\vgui\
|
|
||||||
utils\vgui\include\
|
|
||||||
utils\vgui\lib\win32_vc6\
|
|
@ -110,6 +110,17 @@ if (GOLDSOURCE_SUPPORT)
|
|||||||
target_link_libraries( ${CLDLL_LIBRARY} ${CMAKE_DL_LIBS} )
|
target_link_libraries( ${CLDLL_LIBRARY} ${CMAKE_DL_LIBS} )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties (${CLDLL_SHARED} PROPERTIES
|
set_target_properties (${CLDLL_LIBRARY} PROPERTIES
|
||||||
POSITION_INDEPENDENT_CODE 1)
|
POSITION_INDEPENDENT_CODE 1)
|
||||||
|
|
||||||
|
if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||||
|
set_target_properties(${CLDLL_LIBRARY} PROPERTIES
|
||||||
|
OUTPUT_NAME "client"
|
||||||
|
PREFIX "")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
install( TARGETS ${CLDLL_LIBRARY}
|
||||||
|
DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/"
|
||||||
|
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
|
||||||
|
GROUP_READ GROUP_EXECUTE
|
||||||
|
WORLD_READ WORLD_EXECUTE )
|
||||||
|
42
debug.bat
42
debug.bat
@ -1,42 +0,0 @@
|
|||||||
@echo off
|
|
||||||
|
|
||||||
set MSDEV=BuildConsole
|
|
||||||
set CONFIG=/ShowTime /ShowAgent /nologo /cfg=
|
|
||||||
set MSDEV=msdev
|
|
||||||
set CONFIG=/make
|
|
||||||
set build_type=debug
|
|
||||||
set BUILD_ERROR=
|
|
||||||
call vcvars32
|
|
||||||
|
|
||||||
%MSDEV% engine/engine.dsp %CONFIG%"engine - Win32 Debug" %build_target%
|
|
||||||
if errorlevel 1 set BUILD_ERROR=1
|
|
||||||
|
|
||||||
%MSDEV% mainui/mainui.dsp %CONFIG%"mainui - Win32 Debug" %build_target%
|
|
||||||
if errorlevel 1 set BUILD_ERROR=1
|
|
||||||
|
|
||||||
if "%BUILD_ERROR%"=="" goto build_ok
|
|
||||||
|
|
||||||
echo *********************
|
|
||||||
echo *********************
|
|
||||||
echo *** Build Errors! ***
|
|
||||||
echo *********************
|
|
||||||
echo *********************
|
|
||||||
echo press any key to exit
|
|
||||||
echo *********************
|
|
||||||
pause>nul
|
|
||||||
goto done
|
|
||||||
|
|
||||||
|
|
||||||
@rem
|
|
||||||
@rem Successful build
|
|
||||||
@rem
|
|
||||||
:build_ok
|
|
||||||
|
|
||||||
rem //delete log files
|
|
||||||
if exist engine\engine.plg del /f /q engine\engine.plg
|
|
||||||
if exist mainui\mainui.plg del /f /q mainui\mainui.plg
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo Build succeeded!
|
|
||||||
echo
|
|
||||||
:done
|
|
@ -145,6 +145,17 @@ endif()
|
|||||||
|
|
||||||
add_library (${SVDLL_LIBRARY} SHARED ${SVDLL_SOURCES})
|
add_library (${SVDLL_LIBRARY} SHARED ${SVDLL_SOURCES})
|
||||||
|
|
||||||
set_target_properties (${SVDLL_SHARED} PROPERTIES
|
set_target_properties (${SVDLL_LIBRARY} PROPERTIES
|
||||||
POSITION_INDEPENDENT_CODE 1)
|
POSITION_INDEPENDENT_CODE 1)
|
||||||
|
|
||||||
|
if(APPLE OR WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||||
|
set_target_properties(${SVDLL_LIBRARY} PROPERTIES
|
||||||
|
OUTPUT_NAME ${SERVER_LIBRARY_NAME}
|
||||||
|
PREFIX "")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
install( TARGETS ${SVDLL_LIBRARY}
|
||||||
|
DESTINATION "${GAMEDIR}/${SERVER_INSTALL_DIR}/"
|
||||||
|
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
|
||||||
|
GROUP_READ GROUP_EXECUTE
|
||||||
|
WORLD_READ WORLD_EXECUTE)
|
||||||
|
@ -3327,6 +3327,10 @@ void CBasePlayer::ForceClientDllUpdate( void )
|
|||||||
m_fWeapon = FALSE; // Force weapon send
|
m_fWeapon = FALSE; // Force weapon send
|
||||||
m_fKnownItem = FALSE; // Force weaponinit messages.
|
m_fKnownItem = FALSE; // Force weaponinit messages.
|
||||||
m_fInitHUD = TRUE; // Force HUD gmsgResetHUD message
|
m_fInitHUD = TRUE; // Force HUD gmsgResetHUD message
|
||||||
|
m_bSentBhopcap = true; // a1ba: Update bhopcap state
|
||||||
|
memset( m_rgAmmoLast, 0, sizeof( m_rgAmmoLast )); // a1ba: Force update AmmoX
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Now force all the necessary messages
|
// Now force all the necessary messages
|
||||||
// to be sent.
|
// to be sent.
|
||||||
|
62
make_sdk.bat
62
make_sdk.bat
@ -1,62 +0,0 @@
|
|||||||
@echo off
|
|
||||||
color 5A
|
|
||||||
echo XashXT Group 2010 (C)
|
|
||||||
echo Create Xash3D SDK
|
|
||||||
echo.
|
|
||||||
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk/ mkdir D:\Xash3D\src_main\xash_sdk\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\engine/ mkdir D:\Xash3D\src_main\xash_sdk\engine\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\common/ mkdir D:\Xash3D\src_main\xash_sdk\common\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\mainui/ mkdir D:\Xash3D\src_main\xash_sdk\mainui\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\mainui\legacy/ mkdir D:\Xash3D\src_main\xash_sdk\mainui\legacy
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\utils/ mkdir D:\Xash3D\src_main\xash_sdk\utils\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\utils\makefont/ mkdir D:\Xash3D\src_main\xash_sdk\utils\makefont
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui\include/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui\include
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui\lib/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui\lib
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui\lib\win32_vc6/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui\lib\win32_vc6
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\game_launch/ mkdir D:\Xash3D\src_main\xash_sdk\game_launch\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\cl_dll/ mkdir D:\Xash3D\src_main\xash_sdk\cl_dll\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdkcl_dll\hl/ mkdir D:\Xash3D\src_main\xash_sdk\cl_dll\hl\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\dlls/ mkdir D:\Xash3D\src_main\xash_sdk\dlls\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\dlls\wpn_shared/ mkdir D:\Xash3D\src_main\xash_sdk\dlls\wpn_shared\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\game_shared/ mkdir D:\Xash3D\src_main\xash_sdk\game_shared\
|
|
||||||
if not exist D:\Xash3D\src_main\xash_sdk\pm_shared/ mkdir D:\Xash3D\src_main\xash_sdk\pm_shared\
|
|
||||||
@copy /Y engine\*.h xash_sdk\engine\*.h
|
|
||||||
@copy /Y game_launch\*.* xash_sdk\game_launch\*.*
|
|
||||||
@copy /Y mainui\*.* xash_sdk\mainui\*.*
|
|
||||||
@copy /Y mainui\legacy\*.* xash_sdk\mainui\legacy\*.*
|
|
||||||
@copy /Y common\*.* xash_sdk\common\*.*
|
|
||||||
@copy /Y cl_dll\*.* xash_sdk\cl_dll\*.*
|
|
||||||
@copy /Y cl_dll\hl\*.* xash_sdk\cl_dll\hl\*.*
|
|
||||||
@copy /Y dlls\*.* xash_sdk\dlls\*.*
|
|
||||||
@copy /Y dlls\wpn_shared\*.* xash_sdk\dlls\wpn_shared\*.*
|
|
||||||
@copy /Y utils\makefont\*.* xash_sdk\utils\makefont\*.*
|
|
||||||
@copy /Y utils\vgui\include\*.* xash_sdk\utils\vgui\include\*.*
|
|
||||||
@copy /Y utils\vgui\lib\win32_vc6\*.* xash_sdk\utils\vgui\lib\win32_vc6\*.*
|
|
||||||
@copy /Y game_shared\*.* xash_sdk\game_shared\*.*
|
|
||||||
@copy /Y pm_shared\*.* xash_sdk\pm_shared\*.*
|
|
||||||
@copy /Y xash_sdk.dsw xash_sdk\xash_sdk.dsw
|
|
||||||
echo Prepare OK!
|
|
||||||
echo Please wait: creating SDK in progress
|
|
||||||
C:\Progra~1\WinRar\rar a xash_sdk -dh -k -r -s -df -m5 @xash_sdk.lst >>makesdk.log
|
|
||||||
if errorlevel 1 goto error
|
|
||||||
if errorlevel 0 goto ok
|
|
||||||
:ok
|
|
||||||
cls
|
|
||||||
echo SDK was sucessfully created
|
|
||||||
echo and stored in RAR-chive "xash_sdk"
|
|
||||||
echo Press any key for exit. :-)
|
|
||||||
if exist makesdk.log del /f /q makesdk.log
|
|
||||||
exit
|
|
||||||
:error
|
|
||||||
echo ******************************
|
|
||||||
echo ***********Error!*************
|
|
||||||
echo ******************************
|
|
||||||
echo *See makesdk.log for details**
|
|
||||||
echo ******************************
|
|
||||||
echo ******************************
|
|
||||||
echo.
|
|
||||||
echo press any key for exit :-(
|
|
||||||
pause>nul
|
|
||||||
exit
|
|
42
release.bat
42
release.bat
@ -1,42 +0,0 @@
|
|||||||
@echo off
|
|
||||||
|
|
||||||
set MSDEV=BuildConsole
|
|
||||||
set CONFIG=/ShowTime /ShowAgent /nologo /cfg=
|
|
||||||
set MSDEV=msdev
|
|
||||||
set CONFIG=/make
|
|
||||||
set build_type=release
|
|
||||||
set BUILD_ERROR=
|
|
||||||
call vcvars32
|
|
||||||
|
|
||||||
%MSDEV% engine/engine.dsp %CONFIG%"engine - Win32 Release" %build_target%
|
|
||||||
if errorlevel 1 set BUILD_ERROR=1
|
|
||||||
|
|
||||||
%MSDEV% mainui/mainui.dsp %CONFIG%"mainui - Win32 Release" %build_target%
|
|
||||||
if errorlevel 1 set BUILD_ERROR=1
|
|
||||||
|
|
||||||
if "%BUILD_ERROR%"=="" goto build_ok
|
|
||||||
|
|
||||||
echo *********************
|
|
||||||
echo *********************
|
|
||||||
echo *** Build Errors! ***
|
|
||||||
echo *********************
|
|
||||||
echo *********************
|
|
||||||
echo press any key to exit
|
|
||||||
echo *********************
|
|
||||||
pause>nul
|
|
||||||
goto done
|
|
||||||
|
|
||||||
|
|
||||||
@rem
|
|
||||||
@rem Successful build
|
|
||||||
@rem
|
|
||||||
:build_ok
|
|
||||||
|
|
||||||
rem //delete log files
|
|
||||||
if exist engine\engine.plg del /f /q engine\engine.plg
|
|
||||||
if exist mainui\mainui.plg del /f /q mainui\mainui.plg
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo Build succeeded!
|
|
||||||
echo
|
|
||||||
:done
|
|
65
xash.dsw
65
xash.dsw
@ -1,65 +0,0 @@
|
|||||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
|
||||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "hl"=".\dlls\hl.dsp" - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "client"=".\cl_dll\cl_dll.dsp" - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "mainui"=".\mainui\mainui.dsp" - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "engine"=".\engine\engine.dsp" - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Global:
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<3>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
65
xash_sdk.dsw
65
xash_sdk.dsw
@ -1,65 +0,0 @@
|
|||||||
Microsoft Developer Studio Workspace File, Format Version 6.00
|
|
||||||
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "hl"=".\dlls\hl.dsp" - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "client"=".\cl_dll\cl_dll.dsp" - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "mainui"=".\mainui\mainui.dsp" - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Project: "game"=".\game_launch\game.dsp" - Package Owner=<4>
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<4>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
Global:
|
|
||||||
|
|
||||||
Package=<5>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
Package=<3>
|
|
||||||
{{{
|
|
||||||
}}}
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
22
xash_sdk.lst
22
xash_sdk.lst
@ -1,22 +0,0 @@
|
|||||||
//=======================================================================
|
|
||||||
// Copyright XashXT Group 2011 Š
|
|
||||||
// list with SDK directories
|
|
||||||
//=======================================================================
|
|
||||||
|
|
||||||
// global stuff
|
|
||||||
xash_sdk\xash_sdk.dsw
|
|
||||||
xash_sdk\cl_dll\
|
|
||||||
xash_sdk\cl_dll\hl\
|
|
||||||
xash_sdk\common\
|
|
||||||
xash_sdk\dlls\
|
|
||||||
xash_sdk\game_shared\
|
|
||||||
xash_sdk\game_launch\
|
|
||||||
xash_sdk\engine\
|
|
||||||
xash_sdk\pm_shared\
|
|
||||||
xash_sdk\mainui\
|
|
||||||
xash_dsk\mainui\legacy
|
|
||||||
xash_sdk\utils\
|
|
||||||
xash_sdk\makefont\
|
|
||||||
xash_sdk\utils\vgui\
|
|
||||||
xash_sdk\utils\vgui\include\
|
|
||||||
xash_sdk\utils\vgui\lib\win32_vc6\
|
|
Loading…
x
Reference in New Issue
Block a user