chaos pt 2

[carveJwlIkooP6JGAAIwe30JlM.git] / build.c

diff --git a/build.c b/build.c
index d318d5c6297520b87ab7d27a99e7931e1ea7519d..0470a3b926f199fc6b91e3c52a86c5a33bd27b66 100644 (file)
--- a/build.c
+++ b/build.c
@@ -30,12 +30,26 @@ 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 );
-   vg_build_object( "gameserver.c" );
 
-   vg_build_link( "-lm -lsdkencryptedappticket -lsteam_api " );
+   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" );?????
@@ -58,6 +72,13 @@ void build_servermonitor( enum compiler compiler ){
    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 ){
@@ -65,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 );
 }
@@ -169,9 +190,15 @@ int main( int argc, char *argv[] ){
       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( "clean" ) )
          vg_build_clean();
 
@@ -218,7 +245,7 @@ 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_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" );
@@ -233,6 +260,7 @@ void build_shaders(void){
 
    /* 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" );
@@ -247,5 +275,6 @@ void build_shaders(void){
    _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" );
 }