Skip to content

Commit

Permalink
Rename to TaystJK and revert back to japro folder name
Browse files Browse the repository at this point in the history
  • Loading branch information
taysta committed Mar 24, 2024
1 parent 3e6d3f1 commit 2229f65
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions codemp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -784,15 +784,15 @@ endif(BuildMPDed)

install(FILES
${CMAKE_CURRENT_BINARY_DIR}/japro-assets.pk3
DESTINATION "${JKAInstallDir}/taystjk"
DESTINATION "${JKAInstallDir}/japro"
COMPONENT ${JKAMPCoreComponent})

install(FILES
${CMAKE_SOURCE_DIR}/assets/settings/cosmetics/example.cosmetic
DESTINATION "${JKAInstallDir}/taystjk/settings/cosmetics/hats/"
DESTINATION "${JKAInstallDir}/japro/settings/cosmetics/hats/"
COMPONENT ${JKAMPCoreComponent})

install(FILES
${CMAKE_SOURCE_DIR}/assets/settings/cosmetics/example.cosmetic
DESTINATION "${JKAInstallDir}/taystjk/settings/cosmetics/capes/"
DESTINATION "${JKAInstallDir}/japro/settings/cosmetics/capes/"
COMPONENT ${JKAMPCoreComponent})
6 changes: 3 additions & 3 deletions codemp/cgame/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,17 @@ endif()
if(MakeApplicationBundles AND BuildMPEngine)
install(TARGETS ${MPCGame}
LIBRARY
DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/taystjk"
DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/japro"
COMPONENT ${JKAMPCoreComponent})
elseif(WIN32)
install(TARGETS ${MPCGame}
RUNTIME
DESTINATION "${JKAInstallDir}/taystjk"
DESTINATION "${JKAInstallDir}/japro"
COMPONENT ${JKAMPCoreComponent})
else()
install(TARGETS ${MPCGame}
LIBRARY
DESTINATION "${JKAInstallDir}/taystjk"
DESTINATION "${JKAInstallDir}/japro"
COMPONENT ${JKAMPCoreComponent})
endif()

Expand Down
6 changes: 3 additions & 3 deletions codemp/game/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -221,17 +221,17 @@ endif()
if(MakeApplicationBundles AND BuildMPEngine)
install(TARGETS ${MPGame}
LIBRARY
DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/taystjk"
DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/japro"
COMPONENT ${JKAMPCoreComponent})
elseif(WIN32)
install(TARGETS ${MPGame}
RUNTIME
DESTINATION "${JKAInstallDir}/taystjk"
DESTINATION "${JKAInstallDir}/japro"
COMPONENT ${JKAMPCoreComponent})
else()
install(TARGETS ${MPGame}
LIBRARY
DESTINATION "${JKAInstallDir}/taystjk"
DESTINATION "${JKAInstallDir}/japro"
COMPONENT ${JKAMPCoreComponent})
endif()

Expand Down
2 changes: 1 addition & 1 deletion codemp/qcommon/q_shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#define HOMEPATH_NAME_MACOSX HOMEPATH_NAME_WIN

#define BASEGAME "base"
#define TAYSTJKGAME "taystjk"
#define TAYSTJKGAME "japro"

//NOTENOTE: Only change this to re-point ICARUS to a new script directory
#define Q3_SCRIPT_DIR "scripts"
Expand Down
6 changes: 3 additions & 3 deletions codemp/ui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,17 @@ endif()
if(MakeApplicationBundles AND BuildMPEngine)
install(TARGETS ${MPUI}
LIBRARY
DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/taystjk"
DESTINATION "${JKAInstallDir}/${MPEngine}.app/Contents/MacOS/japro"
COMPONENT ${JKAMPCoreComponent})
elseif(WIN32)
install(TARGETS ${MPUI}
RUNTIME
DESTINATION "${JKAInstallDir}/taystjk"
DESTINATION "${JKAInstallDir}/japro"
COMPONENT ${JKAMPCoreComponent})
else()
install(TARGETS ${MPUI}
LIBRARY
DESTINATION "${JKAInstallDir}/taystjk"
DESTINATION "${JKAInstallDir}/japro"
COMPONENT ${JKAMPCoreComponent})
endif()

Expand Down

0 comments on commit 2229f65

Please sign in to comment.