Migrate to hakkun

Author: fruityloops1

.build_counter

@@ -1 +1 @@
-1838
+1839

.clang-format

@@ -1 +1,9 @@
-BasedOnStyle: WebKit
+BasedOnStyle: WebKit
+QualifierAlignment: Left
+NamespaceIndentation: All
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterEnum: true
+  AfterFunction: false
+  AfterClass: false
+  SplitEmptyFunction: false

.gitignore

@@ -41,4 +41,6 @@ build.sh
 .vscode/
 .clangd/
 .idea/
-cmake-build-debug/
+cmake-build-debug/
+
+lib/std

.gitmodules

@@ -24,3 +24,6 @@
 [submodule "server/Library/json"]
 	path = server/Library/json
 	url = https://github.com/nlohmann/json
+[submodule "sys"]
+	path = sys
+	url = https://github.com/fruityloops1/LibHakkun

CMakeLists.txt

@@ -1,34 +1,23 @@
-cmake_minimum_required(VERSION 3.21)
-project(subsdk)
+cmake_minimum_required(VERSION 3.16)
 
-## Error if not using switch toolchain file
-if (NOT SWITCH)
-  message(FATAL_ERROR "Not targeting switch, make sure to specify -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain.cmake")
-endif()
-
-set(CMAKE_C_STANDARD 17)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/sys/cmake/toolchain.cmake")
+project(BowsersFuryMultiplayer VERSION 1.0 LANGUAGES ASM C CXX)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-enable_language(ASM C CXX)
-
-## Title Id
-set(CONFIG_TITLE_ID 0x010028600ebda000)
-add_compile_definitions(EXL_PROGRAM_ID=${CONFIG_TITLE_ID} EXL_LOAD_KIND=Module EXL_LOAD_KIND_ENUM=2 NNSDK IMGUI_USER_CONFIG="imgui_backend/nvn_imgui_config.h" private=public protected=public DEBUGMENU)
 
-set(NN_SDK_MAJOR 4) # idk
-set(NN_SDK_MINOR 0) # idk
-set(NN_SDK_PATCH 0) # idk
-set(NN_SDK_TYPE "Release")
-set(NN_WARE_MAJOR 4) # idk
-set(NN_WARE_MINOR 0) # idk
-set(NN_WARE_PATCH 0) # idk
+include(config/config.cmake)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/module/subsdk9.json.template ${CMAKE_CURRENT_BINARY_DIR}/subsdk9.json)
+file(GLOB_RECURSE SOURCES_ASM ${PROJECT_SOURCE_DIR}/src/*.S)
+file(GLOB_RECURSE SOURCES_C ${PROJECT_SOURCE_DIR}/src/*.c)
+file(GLOB_RECURSE SOURCES_CXX ${PROJECT_SOURCE_DIR}/src/*.cpp)
+file(GLOB IMGUI_SOURCES ${PROJECT_SOURCE_DIR}/lib/imgui/*.cpp)
+file(GLOB ENET_SOURCES ${PROJECT_SOURCE_DIR}/lib/enet-nx/source/*.c ${PROJECT_SOURCE_DIR}/lib/enet-nx/source/*.cpp)
+set(SOURCES ${SOURCES_ASM} ${SOURCES_C} ${SOURCES_CXX} ${IMGUI_SOURCES} ${ENET_SOURCES})
 
 add_subdirectory(${PROJECT_SOURCE_DIR}/lib/penet)
 
-## Project sources
-set (INCLUDE_DIRS 
+add_executable(${PROJECT_NAME} ${SOURCES})
+
+set(INCLUDE_DIRS
   ${PROJECT_SOURCE_DIR}/src/
   ${PROJECT_SOURCE_DIR}/src/lib 
   ${PROJECT_SOURCE_DIR}/include
@@ -38,43 +27,18 @@ set (INCLUDE_DIRS
   ${PROJECT_SOURCE_DIR}/lib/imgui
   ${PROJECT_SOURCE_DIR}/lib/enet-nx/include
   ${PROJECT_SOURCE_DIR}/lib/penet/Include
+  ${PROJECT_SOURCE_DIR}/sys/hakkun/include
 )
-include_directories(${INCLUDE_DIRS})
-
-file(GLOB_RECURSE SOURCES_ASM ${PROJECT_SOURCE_DIR}/src/*.s)
-file(GLOB_RECURSE SOURCES_C ${PROJECT_SOURCE_DIR}/src/*.c)
-file(GLOB_RECURSE SOURCES_CXX ${PROJECT_SOURCE_DIR}/src/*.cpp)
 
-file(GLOB IMGUI_SOURCES ${PROJECT_SOURCE_DIR}/lib/imgui/*.cpp)
-file(GLOB ENET_SOURCES ${PROJECT_SOURCE_DIR}/lib/enet-nx/source/*.c ${PROJECT_SOURCE_DIR}/lib/enet-nx/source/*.cpp)
-
-## Include nx tools
-include(${CMAKE_SOURCE_DIR}/cmake/SwitchTools.cmake)
+include_directories(
+  ${INCLUDE_DIRS}
+)
 
-## subsdk9
-set(CMAKE_EXECUTABLE_SUFFIX ".nss")
-add_executable(subsdk9 ${SOURCES_ASM} ${SOURCES_C} ${SOURCES_CXX} ${IMGUI_SOURCES} ${ENET_SOURCES})
-target_link_libraries(subsdk9 PUBLIC penet)
 target_include_directories(penet PUBLIC ${INCLUDE_DIRS})
 
+target_link_libraries(${PROJECT_NAME} PUBLIC penet)
 
-## Prepare subsdk ld
-set(SUBSDK_LD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/module/subsdk9.ld)
-set(GAME_VERSION 110)
-set(SYMS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/syms/${GAME_VERSION}")
-
-execute_process(
-    COMMAND bash -c "find ${SYMS_PATH} -type f -name '*.sym' -exec cat {} + > ${CMAKE_BINARY_DIR}/syms.ld"
-)
-
-execute_process(COMMAND uname OUTPUT_VARIABLE uname)
-if (uname MATCHES "^MINGW")
-  string(REGEX REPLACE "^/([a-zA-Z])/" "\\1:/" SUBSDK_LD_PATH "${SUBSDK_LD_PATH}")
-endif ()
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/module/subsdk9.specs.template ${CMAKE_CURRENT_BINARY_DIR}/subsdk9.specs)
-
-## Build nso & generate npdm
-add_nso_target_subsdk(subsdk9)
-set_target_properties(subsdk9 PROPERTIES CONFIG_JSON "${CMAKE_CURRENT_BINARY_DIR}/subsdk9.json")
-__generate_npdm(subsdk9)
-set_target_properties(subsdk9 PROPERTIES LINK_FLAGS "-specs ${CMAKE_BINARY_DIR}/subsdk9.specs -g ${ARCH} -nostartfiles -nostdlib")
+include(sys/cmake/module.cmake)
+include(sys/cmake/deploy.cmake)
+include(sys/cmake/sail.cmake)
+usesail(${PROJECT_NAME})

Makefile

@@ -0,0 +1,3 @@
+rtld = 0
+game = 1
+sdk = 3

config/ModuleList.sym

@@ -0,0 +1,2 @@
+@game
+110 = 891687f016a18f1773d4a88ebf8a973c

config/VersionList.sym

@@ -0,0 +1,29 @@
+set(LINKFLAGS -nodefaultlibs)
+set(LLDFLAGS --no-demangle --gc-sections)
+
+set(OPTIMIZE_OPTIONS_DEBUG -O2 -gdwarf-4)
+set(OPTIMIZE_OPTIONS_RELEASE -O3 -ffast-math -flto)
+set(WARN_OPTIONS -Werror=return-type -Wno-invalid-offsetof)
+
+set(INCLUDES include include/agl)
+set(DEFINITIONS DEBUGMENU private=public protected=public)
+
+set(ASM_OPTIONS "")
+set(C_OPTIONS -ffunction-sections -fdata-sections)
+set(CXX_OPTIONS "")
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+
+set(IS_32_BIT FALSE)
+set(TARGET_IS_STATIC FALSE)
+set(MODULE_NAME BowsersFuryMultiplayer)
+set(TITLE_ID 0x010028600EBDA000)
+set(MODULE_BINARY subsdk4)
+set(SDK_PAST_1900 FALSE)
+set(USE_SAIL TRUE)
+
+set(TRAMPOLINE_POOL_SIZE 0x40)
+set(BAKE_SYMBOLS FALSE)
+
+set(HAKKUN_ADDONS HeapSourceDynamic LogManager)
+set(HAKKUN_BSS_HEAP_SIZE 0x100000)

config/config.cmake

@@ -1,6 +1,6 @@
 {
     "name":"Application",
-    "title_id":"@CONFIG_TITLE_ID@",
+    "title_id":"@TITLE_ID@",
     "title_id_range_min":"0x0100000000010000",
     "title_id_range_max":"0x01ffffffffffffff",
     "main_thread_stack_size":"0x00100000",