Make conditional linking happen in makefile for merges

This commit is contained in:
Tiehuis
2015-02-25 10:47:41 +13:00
parent 3db0537685
commit 2d9f89f339
6 changed files with 18 additions and 15 deletions
+1 -2
View File
@@ -11,8 +11,7 @@ void draw_then_sleep(struct gfx_state *s, struct gamestate *g)
int main(int argc, char **argv)
{
struct gameoptions *o = gameoptions_default();
struct gamestate *g = gamestate_init(parse_options(o, argc, argv));
struct gamestate *g = gamestate_init(argc, argv);
struct gfx_state *s = gfx_init(g);
int game_running = true;