Skip to content

Commit

Permalink
enable JK2 in cmake's InstallConfig module so we get runtime libs...a…
Browse files Browse the repository at this point in the history
…nd strip them from the official release anyway :')
  • Loading branch information
Razish committed Sep 29, 2023
1 parent db114cf commit 148030b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,8 @@ jobs:
mv ./OpenJK-linux-x86_64-Release-Non-Portable/* OpenJK-linux-x86_64.tar.gz
mv ./OpenJK-macos-x86_64-Release-Non-Portable/* OpenJK-macos-x86_64.tar.gz
7z a -r OpenJO-windows-x86.zip ./OpenJO-windows-x86-Release-Non-Portable/JediOutcast/*
7z a -r OpenJO-windows-x86_64.zip ./OpenJO-windows-x86_64-Release-Non-Portable/JediOutcast/*
7z a -r OpenJO-windows-x86.zip ./OpenJO-windows-x86-Release-Non-Portable/JediOutcast/* '-x!msvcp*.*' '-x!vcruntime*.*' '-x!concrt*.*'
7z a -r OpenJO-windows-x86_64.zip ./OpenJO-windows-x86_64-Release-Non-Portable/JediOutcast/* '-x!msvcp*.*' '-x!vcruntime*.*' '-x!concrt*.*'
mv ./OpenJO-linux-x86-Release-Non-Portable/* OpenJO-linux-x86.tar.gz
mv ./OpenJO-linux-x86_64-Release-Non-Portable/* OpenJO-linux-x86_64.tar.gz
mv ./OpenJO-macos-x86_64-Release-Non-Portable/* OpenJO-macos-x86_64.tar.gz
Expand Down
14 changes: 7 additions & 7 deletions cmake/Modules/InstallConfig.cmake
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#============================================================================
# Copyright (C) 2015, OpenJK contributors
#
#
# This file is part of the OpenJK source code.
#
#
# OpenJK is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#============================================================================
Expand Down Expand Up @@ -71,7 +71,7 @@ if(WIN32)
set(CPACK_NSIS_PACKAGE_NAME "OpenJK")
set(CPACK_NSIS_MUI_ICON "${SharedDir}/icons/icon.ico")
set(CPACK_NSIS_MUI_UNIICON "${SharedDir}/icons/icon.ico")
set(CPACK_NSIS_URL_INFO_ABOUT "http://openjk.org")
set(CPACK_NSIS_URL_INFO_ABOUT "https://openjk.org")

set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
include(InstallRequiredSystemLibraries)
Expand Down Expand Up @@ -121,8 +121,8 @@ if(WIN32)
endif()

# Don't run this for now until we have JK2 SP working
if(FALSE AND BuildJK2SPEngine)
string(REPLACE "/" "\\\\" ICON "${SPDir}/win32/starwars.ico")
if(BuildJK2SPEngine)
string(REPLACE "/" "\\\\" ICON "${JK2SPDir}/win32/starwars.ico")
set(CPACK_NSIS_CREATE_ICONS_EXTRA
"${CPACK_NSIS_CREATE_ICONS_EXTRA}
CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Jedi Outcast SP.lnk' \\\\
Expand Down
Binary file added codeJK2/win32/starwars.ico
Binary file not shown.

0 comments on commit 148030b

Please sign in to comment.