X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=build.c;h=96a8930cfaa8ddb90238c3e821e9d4691d190161;hb=e591be4b2ed26bbaaea79eff64e7b6070362a6ef;hp=bc6e81a89d6cc8e7ce9a1bfcf0cbfa62971044d5;hpb=2a6a779a1ad3f1a781e2437732bc62055096439e;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/build.c b/build.c index bc6e81a..96a8930 100644 --- a/build.c +++ b/build.c @@ -1,3 +1,4 @@ +#include #include "vg/vg_platform.h" #include "vg/vg_log.h" #include "vg/vg_opt.h" @@ -15,7 +16,7 @@ void build_server( enum compiler compiler ) { vg_build_start( "skaterift_server", compiler ); vg_build_object( "server.c " ); - vg_build_link( "-pthread -lm -lsdkencryptedappticket -lsteam_api " ); + 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" ); @@ -42,7 +43,6 @@ void build_game( enum compiler compiler ) vg_build_symbolic_link( "sound_src", "sound" ); vg_build_syscall( "mkdir -p %s/cfg", vg_compiler.build_dir ); - vg_build_miniaudio(); vg_build(); compiled_something = 1; } @@ -72,6 +72,16 @@ int main( int argc, char *argv[] ) if( vg_long_opt( "mingw" ) ) build_game( k_compiler_mingw ); + 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 ); + else + vg_build_syscall( "./%s", vg_compiler.name ); + chdir( "../../" ); + } + if( vg_long_opt( "tar" ) || vg_opt( 't' ) ) { vg_build_syscall( "mkdir -p dist" ); @@ -80,13 +90,6 @@ int main( int argc, char *argv[] ) vg_compiler.name, uid, vg_compiler.build_dir ); } - if( vg_opt('p') || vg_long_opt("run") ) - { - chdir( vg_compiler.build_dir ); - vg_build_syscall( "./%s", vg_compiler.name ); - chdir( "../../" ); - } - if( vg_long_opt( "zip" ) || vg_opt( 'z' ) ) { vg_build_syscall( "mkdir -p dist" );