From c033e985d10fb75638d8f512a0cc92d198fe93eb Mon Sep 17 00:00:00 2001 From: Wintermute Date: Sat, 19 Oct 2013 17:39:39 +0200 Subject: [PATCH] mock/Makefile: Bugfix bei statischen Bibliotheken. --- badge/jumpnrun/levels.txt | 2 +- badge/jumpnrun/wrongturn.lv | 9 +++++---- mock/Makefile | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/badge/jumpnrun/levels.txt b/badge/jumpnrun/levels.txt index cc57bcc..ab05360 100644 --- a/badge/jumpnrun/levels.txt +++ b/badge/jumpnrun/levels.txt @@ -1,5 +1,5 @@ smb +gnobbel wrongturn foo -gnobbel mean diff --git a/badge/jumpnrun/wrongturn.lv b/badge/jumpnrun/wrongturn.lv index e12b023..a30f63e 100644 --- a/badge/jumpnrun/wrongturn.lv +++ b/badge/jumpnrun/wrongturn.lv @@ -2,10 +2,10 @@ 01 # 01 23 01 23 # 23 K# 23 23 23 01 23 # ##### ########## ##### ### 23 23 23 23 01 01 # - P ? 01 ## # 01 01 ## # 23 M01 ###### 23 ##################### # + P ? 01 ## # 01 01 c ## # 23 M01 ###### 23 ##################### # 23 M ## # ## ## ### # 23 23 MM # # 23 23 # - # 01 ? 23 ####### ## # ## ## #### # 230123###### # 23 CMKCMKCMKCMK D 23 # - 23 01 23 ## # # # ##2323 # # 23 CMKCMKCMKCMKCMKCMK 23 # + # 01 ? 23 ####### ## # ## ## #### # 230123###### # 23 23 # + 23 01 23 ## # # # ##2323 # # 23 CMKCMKCMKCMKCMKCMd 23 # 23 ? ? 23 CC 23 ## M # # # 2323 ## # C K M C K M C K M ######################### M## # 23 ############# ######### # # #### ## ##################### ###### # M 23 # # # ? ? ### # @@ -21,7 +21,8 @@ ? square [items] -D doc +d doc +c checkpoint [enemies] C cat diff --git a/mock/Makefile b/mock/Makefile index 5b9f293..2bbea95 100644 --- a/mock/Makefile +++ b/mock/Makefile @@ -51,7 +51,7 @@ $(BADGE_CXXOBJS) : %.o : %.cc $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c -o $@ $< $(LDLIBS) $(BADGE): $(BADGE_OBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LDLIBS) -o $@ $(+:../badge/%=%) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(+:../badge/%=%) $(LDLIBS) dep: $(DEPS) -- 2.20.1