forked from mvdevs/jk2mv
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
9 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
cmake_minimum_required(VERSION 3.1.0) | ||
|
||
project("JK2MV" HOMEPAGE_URL "https://jk2mv.org" LANGUAGES C CXX) | ||
|
||
# Link directly against libGL.so instead of using GLVND | ||
if (${CMAKE_VERSION} VERSION_GREATER "3.11") | ||
cmake_policy(SET CMP0072 OLD) | ||
|
@@ -19,9 +21,6 @@ list(INSERT CMAKE_MODULE_PATH 0 "${RESDir}") | |
# Project & Versioning | ||
set_property(GLOBAL PROPERTY USE_FOLDERS ON) | ||
|
||
set(ProjectName "JK2MV" CACHE STRING "Project Name") | ||
set(ProjectURL "https://jk2mv.org") | ||
project(${ProjectName}) | ||
|
||
include(GetGitRevisionDescription) | ||
git_describe(MV_VERSION --tags) | ||
|
@@ -357,7 +356,7 @@ endif() | |
add_subdirectory(libs/mongoose) | ||
|
||
# Package | ||
set(CPACK_PACKAGE_NAME ${ProjectName}) | ||
set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) | ||
set(CPACK_PACKAGE_FILE_NAME "jk2mv-v${MV_VERSION}") | ||
set(CPACK_PACKAGE_VENDOR "jk2mv.org") | ||
set(CPACK_PACKAGE_CONTACT "jk2mv.org <[email protected]>") | ||
|
@@ -375,7 +374,7 @@ if(WIN32) | |
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-installer") | ||
|
||
set(CPACK_GENERATOR "NSIS") | ||
set(CPACK_NSIS_URL_INFO_ABOUT ${ProjectURL}) | ||
set(CPACK_NSIS_URL_INFO_ABOUT CMAKE_PROJECT_HOMEPAGE_URL) | ||
|
||
configure_file( | ||
${RESDir}/NSIS.definitions.nsh.in | ||
|
@@ -405,14 +404,14 @@ else() | |
set(CPACK_GENERATOR ${CPACK_GENERATOR} "DEB") | ||
set(CPACK_DEBIAN_PACKAGE_NAME "jk2mv") # debian packages are lowercase | ||
set(CPACK_DEBIAN_PACKAGE_SECTION "games") | ||
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ProjectURL}) | ||
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${PROJECT_HOMEPAGE_URL}) | ||
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${Architecture}) | ||
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) | ||
|
||
set(CPACK_GENERATOR ${CPACK_GENERATOR} "RPM") | ||
set(CPACK_RPM_PACKAGE_NAME "jk2mv") | ||
set(CPACK_RPM_PACKAGE_DESCRIPTION "JK2MV (Multi Version) is a modification for Jedi Knight II: Jedi Outcast. It supports all three game versions and comes with various features and optimizations.") | ||
set(CPACK_RPM_PACKAGE_URL ${ProjectURL}) | ||
set(CPACK_RPM_PACKAGE_URL ${PROJECT_HOMEPAGE_URL}) | ||
set(CPACK_RPM_PACKAGE_LICENSE "GPLv2") | ||
set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games") | ||
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule mvsdk
updated
20 files
+1 −11 | code/api/mvapi.h | |
+0 −3 | code/cgame/cg_local.h | |
+0 −1 | code/cgame/cg_syscalls.asm | |
+0 −5 | code/cgame/cg_syscalls.c | |
+1 −1 | code/cgame/cg_view.c | |
+4 −4 | code/game/bg_misc.c | |
+0 −3 | code/game/g_local.h | |
+0 −1 | code/game/g_syscalls.asm | |
+0 −5 | code/game/g_syscalls.c | |
+0 −3 | code/game/q_shared.h | |
+0 −3 | code/ui/ui_local.h | |
+0 −1 | code/ui/ui_syscalls.asm | |
+0 −5 | code/ui/ui_syscalls.c | |
+0 −4 | tools/CMakeLists.txt | |
+2 −2 | tools/asm/cmdlib.c | |
+2 −9 | tools/asm/q3asm.c | |
+1 −1 | tools/cpp/lex.c | |
+1 −1 | tools/cpp/macro.c | |
+1 −4 | tools/qcommon/q_platform.h | |
+2 −6 | tools/rcc/gen.c |