X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=build.c;h=cd721e71e07c568abbce683ebd4fb8be245520e0;hb=e311bbe2fa903a7e2a922f202f389b799193195d;hp=60c1db65ab99615351f0e84ab0a8d4010b86c653;hpb=4c673ebccdd6d12e2eb6c2804b79602da98ea8b1;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/build.c b/build.c index 60c1db6..cd721e7 100644 --- a/build.c +++ b/build.c @@ -15,14 +15,14 @@ int compiled_something = 0; -void build_server( enum compiler compiler ) -{ +/* old highscores server */ +void build_server( enum compiler compiler ){ vg_build_start( "skaterift_server", compiler ); vg_build_object( "server.c " ); vg_build_link( "-lm -lsdkencryptedappticket -lsteam_api " ); vg_build_library_dir( "-L./vg/dep/steam " ); - vg_build_bin_dependency_file( "vg/dep/steam/steamclient.so" ); + vg_build_bin_dependency_file( "vg/dep/steam/steamclient.so" );//TODO???? vg_build_bin_dependency_file( "vg/dep/steam/libsteam_api.so" ); vg_build_bin_dependency_file( "vg/dep/steam/libsdkencryptedappticket.so" ); @@ -30,6 +30,55 @@ void build_server( enum compiler compiler ) compiled_something = 1; } +void build_sqlite3( enum compiler compiler ){ + vg_build_start( "sqlite3.o", compiler ); + vg_build_object( "-c dep/sqlite3/sqlite3.c " ); + vg_build_link( "-ldl " ); + vg_build(); +} + +/* new game server */ +void build_gameserver( enum compiler compiler ){ + build_sqlite3( compiler ); + vg_build_start( "skaterift_gameserver", compiler ); + + if( compiler == k_compiler_gcc ) + vg_build_object( "gameserver.c bin/sqlite3.o-gcc/sqlite3.o " ); + else + vg_build_object( "gameserver.c bin/sqlite3.o-clang/sqlite3.o " ); + + vg_build_include( "-I./dep " ); + + vg_build_link( "-ldl -lpthread -lm -lsdkencryptedappticket -lsteam_api " ); + vg_build_library_dir( "-L./vg/dep/steam " ); + + //vg_build_bin_dependency_file( "vg/dep/steam/steamclient.so" );????? + vg_build_bin_dependency_file( "vg/dep/steam/libsteam_api.so" ); + vg_build_bin_dependency_file( "vg/dep/steam/libsdkencryptedappticket.so" ); + + vg_build(); + compiled_something = 1; +} + +void build_servermonitor( enum compiler compiler ){ + vg_build_start( "skaterift_servermonitor", compiler ); + vg_build_object( "servermonitor_client.c " ); + + vg_build_add_link_for_graphics(); + vg_build_include( "-I./vg/dep " ); + vg_build_copy_graphics_dependencies(); + + vg_build(); + compiled_something = 1; +} + +void build_aadb_edit( enum compiler compiler ){ + vg_build_start( "aadb_edit", compiler ); + vg_build_object( "aadb_edit.c " ); + vg_build(); + compiled_something = 1; +} + void write_msg( vg_msg *msg, const char *path ){ FILE *fp = fopen( path, "wb" ); if( !fp ){ @@ -37,7 +86,7 @@ void write_msg( vg_msg *msg, const char *path ){ exit(0); } - fwrite( msg->buf, msg->cur, 1, fp ); + fwrite( msg->buf, msg->cur.co, 1, fp ); fclose( fp ); vg_success( "Written %s (%ub)\n", path, msg->cur ); } @@ -58,8 +107,7 @@ void write_generic_addon_inf( u32 type, const char *title, } void build_shaders(void); -void build_game( enum compiler compiler ) -{ +void build_game( enum compiler compiler ){ static int shaders_built = 0; if( !shaders_built ){ shaders_built = 1; @@ -81,7 +129,10 @@ void build_game( enum compiler compiler ) vg_build_symbolic_link( "sound_src", "sound" ); vg_build_symbolic_link( "playermodels_src", "playermodels" ); vg_build_syscall( "mkdir -p %s/cfg", vg_compiler.build_dir ); + vg_build_syscall( "mkdir -p %s/savedata", vg_compiler.build_dir ); + vg_build_syscall( "mkdir -p %s/tools", vg_compiler.build_dir ); + vg_build_syscall( "cp blender_export.py %s/tools/", vg_compiler.build_dir ); write_generic_addon_inf( k_addon_type_board, "Longboard", "board.mdl", @@ -111,6 +162,12 @@ void build_game( enum compiler compiler ) write_generic_addon_inf( k_addon_type_player, "Outlaw", "ch_outlaw.mdl", "playermodels_src/skaterift_outlaw/addon.inf" ); + write_generic_addon_inf( k_addon_type_player, + "Chip", "ch_chip.mdl", + "playermodels_src/skaterift_chip/addon.inf" ); + write_generic_addon_inf( k_addon_type_player, + "Aaron", "ch_aaron.mdl", + "playermodels_src/skaterift_aaron/addon.inf" ); vg_build(); compiled_something = 1; @@ -120,8 +177,7 @@ int main( int argc, char *argv[] ){ time_t uid = time(NULL); char *arg; - while( vg_argp( argc, argv ) ) - { + while( vg_argp( argc, argv ) ){ if( vg_long_opt( "debug" ) || vg_opt( 'd' ) ) vg_build_mode_debug(); @@ -131,6 +187,24 @@ int main( int argc, char *argv[] ){ if( vg_long_opt( "clang-server" ) ) build_server( k_compiler_clang ); + if( vg_long_opt( "gcc-gameserver" ) ) + build_gameserver( k_compiler_gcc ); + + if( vg_long_opt( "clang-gameserver" ) ) + build_gameserver( k_compiler_clang ); + + if( vg_long_opt( "gcc-servermonitor" ) ) + build_servermonitor( k_compiler_gcc ); + + if( vg_long_opt( "clang-aadb-edit" ) ) + build_aadb_edit( k_compiler_clang ); + + if( vg_long_opt( "clang-demo" ) ) + build_game( k_compiler_clang ); + + if( vg_long_opt( "clean" ) ) + vg_build_clean(); + if( vg_long_opt( "clang" ) ) build_game( k_compiler_clang ); @@ -140,8 +214,7 @@ int main( int argc, char *argv[] ){ if( vg_long_opt( "mingw" ) ) build_game( k_compiler_mingw ); - if( vg_opt('p') || vg_long_opt("run") ) - { + if( vg_opt('p') || vg_long_opt("run") ){ chdir( vg_compiler.build_dir ); if( vg_compiler.compiler == k_compiler_mingw ) vg_build_syscall( "wine %s.exe", vg_compiler.name ); @@ -150,16 +223,14 @@ int main( int argc, char *argv[] ){ chdir( "../../" ); } - if( vg_long_opt( "tar" ) || vg_opt( 't' ) ) - { + if( vg_long_opt( "tar" ) || vg_opt( 't' ) ){ vg_build_syscall( "mkdir -p dist" ); if( compiled_something ) vg_build_syscall( "tar -chzvf dist/%s-%u.tar.gz %s", vg_compiler.name, uid, vg_compiler.build_dir ); } - if( vg_long_opt( "zip" ) || vg_opt( 'z' ) ) - { + if( vg_long_opt( "zip" ) || vg_opt( 'z' ) ){ vg_build_syscall( "mkdir -p dist" ); if( compiled_something ) vg_build_syscall( "zip -r9 dist/%s-%u.zip %s", @@ -171,38 +242,45 @@ int main( int argc, char *argv[] ){ #define _S( NAME, VS, FS ) \ vg_build_shader( "shaders/" VS, "shaders/" FS, NULL, "shaders", NAME ) -void build_shaders(void) -{ +void build_shaders(void){ 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_fxglow", "scene.vs", "scene_fxglow.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.vs", "scene_route.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_gate.vs", "model_gate_lq.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( "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" ); }