projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix username bug, fix animator spin bug
[carveJwlIkooP6JGAAIwe30JlM.git]
/
build.c
diff --git
a/build.c
b/build.c
index b3a4352318c87c09496d8bc54cd8481dd58abfb5..154c4744f306b402c3bf54d2f2f00e7bda5f6874 100644
(file)
--- 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 "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
/*
* c build.c --release --clang
@@
-82,42
+82,49
@@
void build_game( enum compiler compiler )
vg_build_symbolic_link( "playermodels_src", "playermodels" );
vg_build_syscall( "mkdir -p %s/cfg", vg_compiler.build_dir );
vg_build_symbolic_link( "playermodels_src", "playermodels" );
vg_build_syscall( "mkdir -p %s/cfg", 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");
"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");
"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");
"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");
"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");
"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");
"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" );
"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" );
"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" );
"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;
}
vg_build();
compiled_something = 1;
}
-int main( int argc, char *argv[] )
-{
+int main( int argc, char *argv[] ){
time_t uid = time(NULL);
char *arg;
time_t uid = time(NULL);
char *arg;
@@
-132,6
+139,9
@@
int main( int argc, char *argv[] )
if( vg_long_opt( "clang-server" ) )
build_server( k_compiler_clang );
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 );
if( vg_long_opt( "clang" ) )
build_game( k_compiler_clang );
@@
-179,6
+189,7
@@
void build_shaders(void)
/* Scene */
_S( "scene_standard", "scene.vs", "scene_standard.fs" );
_S( "scene_standard_alphatest", "scene.vs", "scene_standard_alphatest.fs" );
/* 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_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_vertex_blend", "scene.vs", "scene_vertex_blend.fs" );
_S( "scene_terrain", "scene.vs", "scene_terrain.fs" );
_S( "scene_route", "scene.vs", "scene_route.fs" );