From abc3fa4e8d493c1bce43fddf834b70cad8c629b4 Mon Sep 17 00:00:00 2001 From: Plagman Date: Fri, 9 Nov 2012 18:05:21 +0000 Subject: [PATCH] Fix the C++ build on Linux with LTO. git-svn-id: https://svn.eduke32.com/eduke32@3137 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile | 2 ++ polymer/eduke32/build/Makefile | 2 ++ polymer/eduke32/build/src/engine.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 0a95da787..504ad4fbf 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -524,9 +524,11 @@ $(OBJ)/editor_banner.$o: $(RSRC)/editor_banner.c $(RSRC)/game_banner.c: $(RSRC)/game.bmp echo "#include " > $@ + echo "extern const GdkPixdata startbanner_pixdata;" >> $@ gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $^ | sed 's/load_inc//' >> $@ $(RSRC)/editor_banner.c: $(RSRC)/build.bmp echo "#include " > $@ + echo "extern const GdkPixdata startbanner_pixdata;" >> $@ gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $^ | sed 's/load_inc//' >> $@ # PHONIES diff --git a/polymer/eduke32/build/Makefile b/polymer/eduke32/build/Makefile index 5ea9f7f1a..e7d27977a 100644 --- a/polymer/eduke32/build/Makefile +++ b/polymer/eduke32/build/Makefile @@ -357,9 +357,11 @@ $(OBJ)/%.$o: $(RSRC)/%.c $(OBJ)/editor_banner.$o: $(RSRC)/editor_banner.c echo "#include " > $@ + echo "extern const GdkPixdata startbanner_pixdata;" >> $@ gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $^ | sed 's/load_inc//' >> $@ $(RSRC)/editor_banner.c: $(RSRC)/build.bmp echo "#include " > $@ + echo "extern const GdkPixdata startbanner_pixdata;" >> $@ gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $^ | sed 's/load_inc//' >> $@ # PHONIES diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index f0a2dd211..84017c2f9 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -224,7 +224,7 @@ static int16_t maphacklight[PR_MAXLIGHTS]; #endif // forward refs -inline int32_t getscreenvdisp(int32_t bz, int32_t zoome); +int32_t getscreenvdisp(int32_t bz, int32_t zoome); void screencoords(int32_t *xres, int32_t *yres, int32_t x, int32_t y, int32_t zoome); static void scansector(int16_t sectnum);