X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=build.c;h=1c17f14e2be01a5814faf0088244f2f7015a53f3;hb=53597f45307d8a2120e3a0bbe71797b216e8750b;hp=b3a4352318c87c09496d8bc54cd8481dd58abfb5;hpb=fdd41609e59c7df548682b25001f0015dc1acbea;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/build.c b/build.c
index b3a4352..1c17f14 100644
--- a/build.c
+++ b/build.c
@@ -5,7 +5,7 @@
 #include "vg/vg_build.h"
 #include "vg/vg_build_utils_shader.h"
 #include "vg/vg_msg.h"
-#include "workshop_types.h"
+#include "addon_types.h"
 
 /* 
  * c build.c --release --clang 
@@ -81,43 +81,51 @@ 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_workshop_file_type_board, 
+   write_generic_addon_inf( k_addon_type_board, 
                             "Longboard", "board.mdl", 
                             "boards_src/skaterift_long/addon.inf");
-   write_generic_addon_inf( k_workshop_file_type_board, 
+   write_generic_addon_inf( k_addon_type_board, 
                             "Fractal", "board.mdl", 
                             "boards_src/skaterift_fract/addon.inf");
-   write_generic_addon_inf( k_workshop_file_type_board,
+   write_generic_addon_inf( k_addon_type_board,
                             "Striped", "board.mdl",
                             "boards_src/skaterift_striped/addon.inf");
-   write_generic_addon_inf( k_workshop_file_type_board,
+   write_generic_addon_inf( k_addon_type_board,
                             "Licco", "board.mdl",
                             "boards_src/skaterift_licco/addon.inf");
-   write_generic_addon_inf( k_workshop_file_type_board,
+   write_generic_addon_inf( k_addon_type_board,
                             "Hypno", "board.mdl",
                             "boards_src/skaterift_spiral/addon.inf");
-   write_generic_addon_inf( k_workshop_file_type_board,
+   write_generic_addon_inf( k_addon_type_board,
                             "Shark", "board.mdl",
                             "boards_src/skaterift_shark/addon.inf");
 
-   write_generic_addon_inf( k_workshop_file_type_player,
+   write_generic_addon_inf( k_addon_type_player,
                             "De'folde", "ch_new.mdl",
                             "playermodels_src/skaterift_new/addon.inf" );
-   write_generic_addon_inf( k_workshop_file_type_player,
+   write_generic_addon_inf( k_addon_type_player,
                             "Jordan", "ch_jordan.mdl",
                             "playermodels_src/skaterift_jordan/addon.inf" );
-   write_generic_addon_inf( k_workshop_file_type_player,
+   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;
 }
 
-int main( int argc, char *argv[] )
-{
+int main( int argc, char *argv[] ){
    time_t uid = time(NULL);
 
    char *arg;
@@ -132,6 +140,9 @@ int main( int argc, char *argv[] )
       if( vg_long_opt( "clang-server" ) )
          build_server( k_compiler_clang );
 
+      if( vg_long_opt( "clean" ) )
+         vg_build_clean();
+
       if( vg_long_opt( "clang" ) )
          build_game( k_compiler_clang );
 
@@ -179,14 +190,18 @@ void build_shaders(void)
    /* Scene */
    _S( "scene_standard",            "scene.vs", "scene_standard.fs" );
    _S( "scene_standard_alphatest",  "scene.vs", "scene_standard_alphatest.fs" );
+   _S( "scene_override",            "scene.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_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" );