X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=build.c;h=3cb9299dbe0b4d4cd9d86a7c54137d4fce465751;hb=refs%2Fheads%2Fmenu2;hp=5958fa3a9d5e94a1c0923d072b38f8e05a5afec7;hpb=bee289e533fffc7adc40bcfbf44e93bef46ef120;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/build.c b/build.c index 5958fa3..8a82f49 100644 --- a/build.c +++ b/build.c @@ -1,4 +1,4 @@ -#include "vg/vg.h" +#include "vg/vg_tool.h" #include "vg/vg_platform.h" #include "vg/vg_log.h" #include "vg/vg_opt.h" @@ -7,7 +7,11 @@ #include "vg/vg_msg.h" #include "addon_types.h" -u32 optimize_test_compile = 0; +#define C0_STOPGAP +#include "vg/vg_m.h" +#include "model.h" +#include "model.c" +#include "c0_stopgap.c" /* * Addon metadata utilities @@ -26,7 +30,8 @@ void write_msg( vg_msg *msg, const char *path ){ } void write_generic_addon_inf( u32 type, const char *title, - const char *content, const char *dest ){ + const char *content, const char *dest ) +{ u8 descriptor_buf[ 512 ]; vg_msg descriptor = {0}; descriptor.buf = descriptor_buf; @@ -34,7 +39,7 @@ void write_generic_addon_inf( u32 type, const char *title, vg_msg_frame( &descriptor, "workshop" ); vg_msg_wkvstr( &descriptor, "title", title ); vg_msg_wkvstr( &descriptor, "author", "Skaterift" ); - vg_msg_wkvu32( &descriptor, "type", type ); + vg_msg_wkvnum( &descriptor, "type", k_vg_msg_u32, 1, &type ); vg_msg_end_frame( &descriptor ); vg_msg_wkvstr( &descriptor, "content", content ); write_msg( &descriptor, dest ); @@ -45,172 +50,272 @@ void write_generic_addon_inf( u32 type, const char *title, * -------------------------------------------------------------------------- */ /* operates in the local files, not in the bin folders */ -void build_game_metadata(void){ +void build_game_metadata(void) +{ vg_info( "Building game metadata\n" ); write_generic_addon_inf( k_addon_type_board, "Longboard", "board.mdl", - "boards_src/skaterift_long/addon.inf"); + "content_skaterift/boards/skaterift_long/addon.inf"); write_generic_addon_inf( k_addon_type_board, "Fractal", "board.mdl", - "boards_src/skaterift_fract/addon.inf"); + "content_skaterift/boards/skaterift_fract/addon.inf"); write_generic_addon_inf( k_addon_type_board, "Striped", "board.mdl", - "boards_src/skaterift_striped/addon.inf"); + "content_skaterift/boards/skaterift_striped/addon.inf"); write_generic_addon_inf( k_addon_type_board, "Licco", "board.mdl", - "boards_src/skaterift_licco/addon.inf"); + "content_skaterift/boards/skaterift_licco/addon.inf"); write_generic_addon_inf( k_addon_type_board, "Hypno", "board.mdl", - "boards_src/skaterift_spiral/addon.inf"); + "content_skaterift/boards/skaterift_spiral/addon.inf"); write_generic_addon_inf( k_addon_type_board, "Shark", "board.mdl", - "boards_src/skaterift_shark/addon.inf"); + "content_skaterift/boards/skaterift_shark/addon.inf"); write_generic_addon_inf( k_addon_type_player, "De'folde", "ch_new.mdl", - "playermodels_src/skaterift_new/addon.inf" ); + "content_skaterift/playermodels/skaterift_new/addon.inf" ); write_generic_addon_inf( k_addon_type_player, "Jordan", "ch_jordan.mdl", - "playermodels_src/skaterift_jordan/addon.inf" ); + "content_skaterift/playermodels/skaterift_jordan/addon.inf" ); write_generic_addon_inf( k_addon_type_player, "Outlaw", "ch_outlaw.mdl", - "playermodels_src/skaterift_outlaw/addon.inf" ); + "content_skaterift/playermodels/skaterift_outlaw/addon.inf" ); write_generic_addon_inf( k_addon_type_player, "Chip", "ch_chip.mdl", - "playermodels_src/skaterift_chip/addon.inf" ); + "content_skaterift/playermodels/skaterift_chip/addon.inf" ); write_generic_addon_inf( k_addon_type_player, "Aaron", "ch_aaron.mdl", - "playermodels_src/skaterift_aaron/addon.inf" ); + "content_skaterift/playermodels/skaterift_aaron/addon.inf" ); } -void build_game_content(void){ - vg_low( "Building game content structure\n" ); - const char *project_name = vg_build.project_name.buffer; - vg_symlink( "textures_src", "textures" ); - vg_symlink( "models_src", "models" ); - vg_symlink( "boards_src", "boards" ); - vg_symlink( "maps_src", "maps" ); - vg_symlink( "sound_src", "sound" ); - vg_symlink( "playermodels_src", "playermodels" ); - vg_syscall( "mkdir -p bin/%s/cfg", project_name ); - vg_syscall( "mkdir -p bin/%s/savedata", project_name ); - vg_syscall( "mkdir -p bin/%s/tools", project_name ); - vg_syscall( "cp blender_export.py bin/%s/tools/", project_name ); +#define _S( NAME, VS, FS ) \ + vg_build_shader( "shaders/" VS, "shaders/" FS, NULL, "shaders", NAME ) + +void build_shaders(void){ + vg_info( "Compiling shader headers\n" ); + vg_shader_set_include_dir( "shaders" ); + + /* Scene */ + _S( "scene_standard", "scene.vs", "scene_standard.fs" ); + _S( "scene_standard_alphatest", "scene.vs", "scene_standard_alphatest.fs" ); + _S( "scene_foliage", "scene_foliage.vs", "scene_foliage.fs" ); + _S( "scene_override", "scene_override.vs", "scene_override.fs" ); + _S( "scene_fxglow", "scene_fxglow.vs", "scene_fxglow.fs" ); + _S( "scene_vertex_blend", "scene.vs", "scene_vertex_blend.fs" ); + _S( "scene_terrain", "scene.vs", "scene_terrain.fs" ); + _S( "scene_route", "scene_override.vs", "scene_route.fs" ); + _S( "scene_depth", "scene.vs", "scene_depth.fs" ); + _S( "scene_position", "scene.vs", "scene_position.fs" ); + _S( "scene_cubemapped", "scene.vs", "scene_cubemapped.fs" ); + _S( "scene_water", "scene.vs", "scene_water.fs" ); + _S( "scene_water_fast", "scene.vs", "scene_water_fast.fs" ); + _S( "scene_scoretext", "scene_sfd.vs", "scene_standard.fs" ); + _S( "scene_font", "model_font.vs","scene_font.fs" ); + + /* Models */ + _S( "model_sky", "model.vs", "model_sky.fs" ); + _S( "model_sky_space", "model.vs", "model_sky_space.fs" ); + _S( "model_menu", "model.vs", "model_menu.fs" ); + _S( "model_character_view", "model_skinned.vs", "model_character_view.fs" ); + _S( "model_board_view", "model.vs", "model_character_view.fs" ); + _S( "model_entity", "model.vs", "model_entity.fs" ); + _S( "model_gate", "model.vs", "model_gate_lq.fs" ); + _S( "model_gate_unlinked", "model.vs", "model_gate_unlinked.fs" ); + _S( "model_font", "model_font.vs", "model_font.fs" ); + + _S( "particle", "particle.vs", "particle.fs" ); + _S( "trail", "trail.vs", "trail.fs" ); + + /* 2D */ + _S( "blit", "blit.vs", "blit.fs" ); + _S( "blitblur", "blit.vs", "blitblur.fs" ); + _S( "blitcolour","blit.vs", "colour.fs" ); + _S( "blit_transition", "blit.vs", "blit_transition.fs" ); + _S( "routeui", "routeui.vs", "routeui.fs" ); + + vg_build_shader_impl( "shaders/impl.c" ); +} + +void build_game_content( struct vg_project *proj ) +{ + vg_symlink( proj, "content_skaterift/textures", "textures" ); + vg_symlink( proj, "content_skaterift/models", "models" ); + vg_symlink( proj, "content_skaterift/boards", "boards" ); + vg_symlink( proj, "content_skaterift/maps", "maps" ); + vg_symlink( proj, "content_skaterift/sound", "sound" ); + vg_symlink( proj, "content_skaterift/playermodels", "playermodels" ); + vg_syscall( "mkdir -p bin/%s/cfg", proj->uid.buffer ); + vg_syscall( "mkdir -p bin/%s/savedata", proj->uid.buffer ); + vg_syscall( "mkdir -p bin/%s/tools", proj->uid.buffer ); + vg_syscall( "cp bin/skaterift_blender.zip bin/%s/tools/", proj->uid.buffer ); } -void build_shaders(void); -void compile_game( int binaries, int content ){ +void build_game_bin( struct vg_project *proj, struct vg_compiler_env *env ) +{ static int meta = 0; - if( !meta ){ + if( !meta ) + { meta = 1; build_shaders(); build_game_metadata(); vg_low( "\n\n" ); } + +#include "control_overlay.h" - vg_build_new( "skaterift" ); + struct vg_compiler_conf conf = {0}; - if( binaries ){ - vg_add_source( "skaterift.c" ); - vg_add_graphics(); - vg_add_game_stuff(); - vg_compile( "skaterift" ); + if( env->platform == k_platform_windows ) + { + vg_strcat( &conf.link, "-lws2_32 " ); } - if( content ) - build_game_content(); + //vg_strcat( &conf.defines, "-DSKATERIFT " ); + vg_strcat( &conf.defines, "-DHGATE " ); + + vg_make_app( proj, &(struct vg_engine_config ) + { + .fixed_update_hz = 60, + .legacy_support_vg_msg1 = 1, + .log_source_info = 1, + .steam_api = 1, + .use_3d = 1, + .custom_game_settings = 0, + .custom_shaders = 1 + }, + env, &conf, "client.c", "skaterift" ); + + vg_add_controller_database( proj ); +} + +struct compile_result +build_sqlite_for_env( struct vg_compiler_env *env ) +{ + struct vg_project sqlite_proj; + vg_project_init( &sqlite_proj, "bin", ".sqlite3", env, 0 ); + + struct vg_compiler_env sqlite_env = *env; + sqlite_env.optimization = 3; /* force optimization always */ + sqlite_env.debug_asan = 0; + + struct vg_compiler_conf conf = {0}; + vg_strcat( &conf.link, "-ldl " ); + + return vg_compiler_run( &sqlite_proj, &sqlite_env, &conf, + "dep/sqlite3/sqlite3.c ", "sqlite3", + k_obj_type_obj ); } -void compile_sqlite_obj(void){ - vg_build_new( "sqlite3.o" ); - vg_add_source( "-c dep/sqlite3/sqlite3.c " ); - vg_link( "-ldl " ); - vg_compile( "sqlite3.o" ); +void compile_server( struct vg_project *proj, struct vg_compiler_env *env ) +{ + struct compile_result sqlite = build_sqlite_for_env( env ); + + vg_str sources = {0}; + vg_strcat( &sources, "gameserver.c vg/vg_tool.c vg/vg_steam.c \\\n " ); + vg_strcat( &sources, sqlite.path.buffer ); + + struct vg_compiler_conf conf = {0}; + vg_strcat( &conf.include, "-I. -I./dep " ); + vg_strcat( &conf.library, "-L./vg/dep/steam " ); + vg_strcat( &conf.link, "-ldl -lpthread -lm -lsdkencryptedappticket -lsteam_api " ); + + vg_add_blob( proj, "vg/dep/steam/libsteam_api.so", "" ); + vg_add_blob( proj, "vg/dep/steam/libsdkencryptedappticket.so", "" ); + + vg_compiler_run( proj, env, &conf, sources.buffer, "server", k_obj_type_exe ); } -void compile_server(void){ - vg_build_new( "skaterift_server" ); - vg_add_source( "gameserver.c" ); - vg_add_source( "bin/sqlite3.o-linux-x86_64-clang/sqlite3.o" ); - vg_include_dir( "-I./dep " ); - vg_library_dir( "-L./vg/dep/steam " ); - vg_link( "-ldl -lpthread -lm -lsdkencryptedappticket -lsteam_api " ); - vg_add_blob( "vg/dep/steam/libsteam_api.so", "" ); - vg_add_blob( "vg/dep/steam/libsdkencryptedappticket.so", "" ); - vg_compile( "server" ); +struct compile_result +compile_tools( struct vg_project *proj, struct vg_compiler_env *env ) +{ + struct vg_compiler_conf conf = {0}; + return vg_compiler_run( proj, env, &conf, "skaterift_lib.c", "skaterift", + k_obj_type_shared ); } /* * Scripts * -------------------------------------------------------------------------- */ -void s_release_all(void){ +void s_compile_tools(void) +{ + vg_info( "running script: s_compile_tools(void)\n" ); + + struct vg_project proj; + vg_project_init( &proj, "bin", "skaterift-tools", NULL, 0 ); + + struct vg_compiler_env env = vg_release_env; + + env.platform = k_platform_linux; + struct compile_result r0 = compile_tools( &proj, &env ); + + env.platform = k_platform_windows; + struct compile_result r1 = compile_tools( &proj, &env ); + + vg_syscall("cp %s skaterift_blender/", r0.path ); + vg_syscall("cp %s skaterift_blender/", r1.path ); + vg_syscall( "zip -r bin/skaterift_blender.zip skaterift_blender/ " + "-x skaterift_blender/__pycache__/\\*"); +} + +void s_release_all(void) +{ vg_info( "running script: s_release_all(void)\n" ); - vg_build.optimization = 3; - vg_build.fresh = 1; - vg_build.arch = k_architecture_x86_64; - vg_build.compiler = k_compiler_zigcc; - vg_build.libc = k_libc_version_2_23; - - /* binaries for windows and linux */ - vg_build.platform = k_platform_windows; - compile_game( 1, 0 ); - vg_tarball_last_project(); /* windows binary depot: 2103942 */ - vg_success( "Completed 1/3\n" ); - - vg_build.platform = k_platform_linux; - compile_game( 1, 0 ); - vg_tarball_last_project(); /* linux binary depot: 2103941 */ - vg_success( "Completed 2/3\n" ); - - /* content files for any platform */ - vg_build.platform = k_platform_anyplatform; - vg_build.compiler = k_compiler_blob; - vg_build.arch = k_architecture_anyarch; - vg_build.libc = k_libc_version_native; - compile_game( 0, 1 ); - vg_tarball_last_project(); /* content depot: 2103943 */ - vg_success( "Completed 3/3\n" ); - - /* TODO: DRM thingy? */ + struct vg_project content_proj, windows_proj, linux_proj; + + struct vg_compiler_env env = vg_release_env; + env.platform = k_platform_anyplatform; + vg_project_init( &content_proj, "bin", "skaterift", &env, 1 ); + build_game_content( &content_proj ); + + /* binaries for windows */ + env = vg_release_env; + env.platform = k_platform_windows; + vg_project_init( &windows_proj, "bin", "skaterift", &env, 1 ); + build_game_bin( &windows_proj, &env ); + + /* binaries for linux */ + env = vg_release_env; + env.platform = k_platform_linux; + vg_project_init( &linux_proj, "bin", "skaterift", &env, 1 ); + build_game_bin( &linux_proj, &env ); + + /* package them up for storage */ + vg_tarball_project( &content_proj ); + vg_tarball_project( &linux_proj ); + vg_tarball_project( &windows_proj ); + + /* extreme DRM solutions */ + FILE *fp = fopen( "dist/bin/DRM", "w" ); + fputs( "blibby!", fp ); + fclose( fp ); } -void s_testing_build(void){ +void s_testing_build(void) +{ vg_info( "running script: s_testing_build(void)\n" ); - vg_build.optimization = optimize_test_compile; - vg_build.fresh = 0; - vg_build.platform = k_platform_linux; - vg_build.arch = k_architecture_x86_64; - vg_build.compiler = k_compiler_clang; - vg_build.libc = k_libc_version_native; + struct vg_project test_proj; + vg_project_init( &test_proj, "bin", "skaterift-test", NULL, 0 ); - compile_game( 1, 1 ); - - vg_success( "Completed 1/1\n" ); + build_game_bin( &test_proj, &vg_test_env ); + build_game_content( &test_proj ); + vg_add_blob( &test_proj, "steam_appid.txt", "" ); } -void s_testing_server(void){ +void s_testing_server(void) +{ vg_info( "running script: s_testing_server(void)\n" ); - vg_build.fresh = 0; - vg_build.platform = k_platform_linux; - vg_build.arch = k_architecture_x86_64; - vg_build.compiler = k_compiler_clang; - vg_build.libc = k_libc_version_native; - - /* build sqlite3, alwasy optimized */ - vg_build.optimization = 3; - compile_sqlite_obj(); - vg_success( "Completed 1/2\n" ); - - vg_build.optimization = optimize_test_compile; - compile_server(); - vg_success( "Completed 2/2\n" ); + struct vg_project test_proj; + vg_project_init( &test_proj, "bin", "skaterift-test-server", &vg_test_env, 0 ); + compile_server( &test_proj, &vg_test_env ); } -int main( int argc, char *argv[] ){ +int main( int argc, char *argv[] ) +{ char *arg; while( vg_argp( argc, argv ) ){ if( vg_long_opt( "release-all" ) ) @@ -222,59 +327,12 @@ int main( int argc, char *argv[] ){ if( vg_long_opt( "testing-server" ) ) s_testing_server(); + if( vg_long_opt( "tools" ) ) + s_compile_tools(); + if( vg_opt('r') ) - optimize_test_compile = 3; + vg_test_env.optimization = 3; } - if( vg_build.warnings ) - vg_warn( "Finished with %u warnings\n", vg_build.warnings ); - else - vg_success( "All scripts ran successfully\n" ); -} - -#define _S( NAME, VS, FS ) \ - vg_build_shader( "shaders/" VS, "shaders/" FS, NULL, "shaders", NAME ) - -void build_shaders(void){ - vg_info( "Compiling shader headers\n" ); - vg_shader_set_include_dir( "shaders" ); - - /* Scene */ - _S( "scene_standard", "scene.vs", "scene_standard.fs" ); - _S( "scene_standard_alphatest", "scene.vs", "scene_standard_alphatest.fs" ); - _S( "scene_foliage", "scene_foliage.vs", "scene_foliage.fs" ); - _S( "scene_override", "scene_override.vs", "scene_override.fs" ); - _S( "scene_fxglow", "scene_fxglow.vs", "scene_fxglow.fs" ); - _S( "scene_vertex_blend", "scene.vs", "scene_vertex_blend.fs" ); - _S( "scene_terrain", "scene.vs", "scene_terrain.fs" ); - _S( "scene_route", "scene_override.vs", "scene_route.fs" ); - _S( "scene_depth", "scene.vs", "scene_depth.fs" ); - _S( "scene_position", "scene.vs", "scene_position.fs" ); - _S( "scene_cubemapped", "scene.vs", "scene_cubemapped.fs" ); - _S( "scene_water", "scene.vs", "scene_water.fs" ); - _S( "scene_water_fast", "scene.vs", "scene_water_fast.fs" ); - _S( "scene_scoretext", "scene_sfd.vs", "scene_standard.fs" ); - _S( "scene_font", "model_font.vs","scene_font.fs" ); - - /* Models */ - _S( "model_sky", "model.vs", "model_sky.fs" ); - _S( "model_sky_space", "model.vs", "model_sky_space.fs" ); - _S( "model_menu", "model.vs", "model_menu.fs" ); - _S( "model_character_view", "model_skinned.vs", "model_character_view.fs" ); - _S( "model_board_view", "model.vs", "model_character_view.fs" ); - _S( "model_entity", "model.vs", "model_entity.fs" ); - _S( "model_gate", "model.vs", "model_gate_lq.fs" ); - _S( "model_gate_unlinked", "model.vs", "model_gate_unlinked.fs" ); - _S( "model_font", "model_font.vs", "model_font.fs" ); - - /* Pointcloud */ - //_S( "point_map", "cloud.vs", "cloud.fs" ); - _S( "particle", "particle.vs", "particle.fs" ); - - /* 2D */ - _S( "blit", "blit.vs", "blit.fs" ); - _S( "blitblur", "blit.vs", "blitblur.fs" ); - _S( "blitcolour","blit.vs", "colour.fs" ); - _S( "blit_transition", "blit.vs", "blit_transition.fs" ); - _S( "routeui", "routeui.vs", "routeui.fs" ); + vg_success( "All scripts completed\n" ); }