Integrate all the progress into master #6
|
@ -13,4 +13,14 @@ define cp_artifact
|
|||
)
|
||||
endef
|
||||
|
||||
define cargo_windows_default
|
||||
cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(WINDOWS_TARGET)
|
||||
$(call cp_artifact,$(WINDOWS_ARTIFACT), ../../../bin/$(ARTIFACT).exe)
|
||||
endef
|
||||
|
||||
define cargo_unix_default
|
||||
cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(UNIX_TARGET)
|
||||
$(call cp_artifact,$(UNIX_ARTIFACT), ../../../bin/$(ARTIFACT))
|
||||
endef
|
||||
|
||||
# Windows build requires "rustup target add x86_64-pc-windows-gnu" and "sudo apt-get install mingw-w64"
|
|
@ -6,7 +6,9 @@
|
|||
],
|
||||
"settings": {
|
||||
"cargo_task": [
|
||||
"psxreadmap all!Unix: psxreadmap",
|
||||
"wslpath all!Unix: wslpath",
|
||||
"psxreadmap all-windows!Windows: psxreadmap",
|
||||
"wslpath all-windows!Windows: wslpath"
|
||||
]
|
||||
},
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
include ../Common.mk
|
||||
|
||||
ARTIFACT = psxreadmap
|
||||
|
||||
.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
|
||||
$(WINDOWS_ARTIFACT):
|
||||
$(call cargo_windows_default)
|
||||
|
||||
$(UNIX_ARTIFACT):
|
||||
$(call cargo_unix_default)
|
||||
|
||||
all-windows: $(WINDOWS_ARTIFACT)
|
||||
all: $(UNIX_ARTIFACT)
|
|
@ -4,12 +4,10 @@ ARTIFACT = wslpath
|
|||
|
||||
.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
|
||||
$(WINDOWS_ARTIFACT):
|
||||
cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(WINDOWS_TARGET)
|
||||
$(call cp_artifact,$(WINDOWS_ARTIFACT), ../../../bin/$(ARTIFACT).exe)
|
||||
$(call cargo_windows_default)
|
||||
|
||||
$(UNIX_ARTIFACT):
|
||||
cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(UNIX_TARGET)
|
||||
$(call cp_artifact,$(UNIX_ARTIFACT), ../../../bin/$(ARTIFACT))
|
||||
$(call cargo_unix_default)
|
||||
|
||||
all-windows: $(WINDOWS_ARTIFACT)
|
||||
all: $(UNIX_ARTIFACT)
|
Loading…
Reference in New Issue