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

Fixed bug: makefile link steps always runs (triggered by prebuild and prelink)

Browse Source
This commit is contained in:
starkos 2008-12-22 22:34:30 +00:00
parent 3cdd0d2442
commit 78c4c02997
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/actions/make/make_cpp.tmpl
View File

@ -88,14 +88,12 @@ endif
.PHONY: clean prebuild prelink
<% if os.is("MacOSX") and this.kind == "WindowedApp" then %>
all: $(TARGET) $(dir $(TARGETDIR))PkgInfo $(dir $(TARGETDIR))Info.plist
$(dir $(TARGETDIR))PkgInfo:
$(dir $(TARGETDIR))Info.plist:
all: $(TARGETDIR) $(OBJDIR) prebuild $(OBJECTS) $(RESOURCES) prelink $(TARGET) $(dir $(TARGETDIR))PkgInfo $(dir $(TARGETDIR))Info.plist
<% else %>
all: $(TARGETDIR) $(OBJDIR) prebuild $(OBJECTS) $(RESOURCES) prelink $(TARGET)
<% end %>
$(TARGET): $(TARGETDIR) $(OBJDIR) prebuild $(OBJECTS) $(LDDEPS) $(RESOURCES) prelink
$(TARGET): $(OBJECTS) $(LDDEPS) $(RESOURCES)
@echo Linking <%= this.name %>
@$(LINKCMD)
$(POSTBUILDCMDS)
@ -106,6 +104,12 @@ $(TARGETDIR):
$(OBJDIR):
$(MKDIR_RULE)
<% if os.is("MacOSX") and this.kind == "WindowedApp" then %>
$(dir $(TARGETDIR))PkgInfo:
$(dir $(TARGETDIR))Info.plist:
<% end %>
clean:
@echo Cleaning <%= this.name %>
ifeq (posix,$(SHELLTYPE))

4
src/actions/make/make_csharp.tmpl
View File

@ -174,9 +174,9 @@ endif
.PHONY: clean prebuild prelink
all: $(TARGET) $(COPYFILES)
all: $(TARGETDIR) $(OBJDIR) prebuild $(EMBEDFILES) $(COPYFILES) prelink $(TARGET)
$(TARGET): $(TARGETDIR) $(OBJDIR) prebuild $(SOURCES) $(EMBEDFILES) $(DEPENDS) prelink
$(TARGET): $(SOURCES) $(EMBEDFILES) $(DEPENDS)
$(SILENT) $(CSC) /nologo /out:$@ $(FLAGS) $(REFERENCES) $(SOURCES) $(patsubst %,/resource:%,$(EMBEDFILES))
$(POSTBUILDCMDS)

8
src/host/bytecode.c
View File

File diff suppressed because one or more lines are too long