AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #1229 from LORgames/ssurtees/gmake2Fix

Browse Source 
Generated makefiles no longer error when a configuration can be missing
This commit is contained in:
@starkos 2019-10-21 16:05:57 -04:00 committed by GitHub
commit 448b5cb3ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gmake2/gmake2.lua
View File

@ -251,8 +251,6 @@
end
if not first then
p.outln('else')
p.outln(' $(error "invalid configuration $(config)")')
p.outln('endif')
p.outln('')
end

8
modules/gmake2/tests/test_gmake2_file_rules.lua
View File

@ -157,8 +157,6 @@ $(OBJDIR)/hello.o: src/hello.c
@echo $(notdir $<)
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
else
$(error "invalid configuration $(config)")
endif
]]
end
@ -194,8 +192,6 @@ obj/Release/hello.obj: hello.x
$(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo"
$(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj"
else
$(error "invalid configuration $(config)")
endif
]]
end
@ -227,8 +223,6 @@ obj/Release/hello.obj: hello.x hello.x.inc hello.x.inc2
$(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo"
$(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj"
else
$(error "invalid configuration $(config)")
endif
]]
end
@ -261,8 +255,6 @@ obj/Release/hello.obj: hello.x
$(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj"
obj/Release/hello.other obj/Release/hello.another: obj/Release/hello.obj
else
$(error "invalid configuration $(config)")
endif
]]
end

16
modules/gmake2/tests/test_gmake2_objects.lua
View File

@ -90,8 +90,6 @@ OBJECTS += $(OBJDIR)/hello_debug.o
else ifeq ($(config),release)
OBJECTS += $(OBJDIR)/hello_release.o
else
$(error "invalid configuration $(config)")
endif
]]
@ -156,8 +154,6 @@ OBJECTS += $(OBJDIR)/hello111.o
else ifeq ($(config),release)
OBJECTS += $(OBJDIR)/hello1.o
else
$(error "invalid configuration $(config)")
endif
]]
@ -255,8 +251,6 @@ CUSTOM += obj/Debug/hello.luac
else ifeq ($(config),release)
CUSTOM += obj/Release/hello.luac
else
$(error "invalid configuration $(config)")
endif
]]
end
@ -289,8 +283,6 @@ OBJECTS += obj/Debug/hello.obj
else ifeq ($(config),release)
OBJECTS += obj/Release/hello.obj
else
$(error "invalid configuration $(config)")
endif
]]
end
@ -324,8 +316,6 @@ OBJECTS += obj/Debug/hello.obj
else ifeq ($(config),release)
OBJECTS += obj/Release/hello.obj
else
$(error "invalid configuration $(config)")
endif
]]
end
@ -359,8 +349,6 @@ CUSTOM += obj/Debug/hello.obj
else ifeq ($(config),release)
CUSTOM += obj/Release/hello.obj
else
$(error "invalid configuration $(config)")
endif
]]
end
@ -384,8 +372,6 @@ OBJECTS :=
ifeq ($(config),release)
OBJECTS += $(OBJDIR)/hello.o
else
$(error "invalid configuration $(config)")
endif
]]
@ -405,8 +391,6 @@ OBJECTS :=
ifeq ($(config),release)
OBJECTS += $(OBJDIR)/hello.o
else
$(error "invalid configuration $(config)")
endif
]]