diff options
| author | XaviDCR92 <xavi.dcr@gmail.com> | 2017-09-23 01:32:26 +0200 |
|---|---|---|
| committer | XaviDCR92 <xavi.dcr@gmail.com> | 2017-09-23 01:32:26 +0200 |
| commit | e6d41c59ffa15dee7f8bc9d7ea0e12ac682da595 (patch) | |
| tree | 19a1b57479a66efe6f74c2eedfd4795554fa75b7 /Source/Makefile | |
| parent | 286d13d71d017003df4cb44fc4ef4822d9e39c03 (diff) | |
| download | airport-e6d41c59ffa15dee7f8bc9d7ea0e12ac682da595.tar.gz | |
Bugfix: ptrPlayer->SelectedAircraft was being substracted when == 0 and caused a game crash. Bugfix: aircraft did not stop when DIR_SOUTH.
Diffstat (limited to 'Source/Makefile')
| -rw-r--r-- | Source/Makefile | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/Source/Makefile b/Source/Makefile index 4beb71b..16b30b0 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -38,9 +38,9 @@ EXE_PATH = Exe # PCSX-R EMULATOR_DIR = ~/pcsxr -EMULATOR = pcsxr.exe +EMULATOR = pcsxr # Uncomment the line below if you get no sound output under Linux. -#SOUND_INTERFACE += padsp +SOUND_INTERFACE += padsp EMULATOR_FLAGS = -nogui -psxout # Objects definition @@ -110,11 +110,14 @@ SPRITE_OBJECTS += $(addprefix $(OBJ_FONTS_PATH)/, INTROFNT.TIM \ # Instructions # ------------------------------------ -build: $(BIN_TARGET_PATH)/$(PROJECT).bin +$(BIN_TARGET_PATH)/$(PROJECT).bin: $(EXE_PATH)/$(PROJECT).iso +#~ mkpsxiso $< $@ $(LICENSE_FILE) $(MUSIC_TRACKS) + mkpsxiso $< $@ $(LICENSE_FILE) +# $(PROJECT).cue is automatically generated by mkpsxiso rebuild: make clean - make build + make $(BIN_TARGET_PATH)/$(PROJECT).bin -include $(DEPS) @@ -127,7 +130,7 @@ clean: rm -f $(OBJ_LEVELS_DIR)/*.PLT rm -f $(OBJ_SPRITES_PATH)/*.TIM rm -f $(OBJ_FONTS_PATH)/*.TIM - + $(OBJ_DIR)/%.d: $(SRC_DIR)/%.c $(CC) $< $(DEFINE) $(CC_FLAGS) -MM > $@ @@ -141,18 +144,14 @@ $(EXE_PATH)/$(PROJECT).elf: $(OBJECTS) $(EXE_PATH)/$(PROJECT).iso: $(EXE_PATH)/$(PROJECT).exe $(SOUND_OBJECTS) $(LEVEL_OBJECTS) $(SPRITE_OBJECTS) mkisofs -o $@ -V $(PROJECT) -sysid PLAYSTATION $(CDROM_ROOT) -$(BIN_TARGET_PATH)/$(PROJECT).bin: $(EXE_PATH)/$(PROJECT).iso -#~ mkpsxiso $< $@ $(LICENSE_FILE) $(MUSIC_TRACKS) - mkpsxiso $< $@ $(LICENSE_FILE) -# $(PROJECT).cue is automatically generated by mkpsxiso $(EXE_PATH)/$(PROJECT).exe: $(EXE_PATH)/$(PROJECT).elf $(ELF2EXE) $< $@ $(ELF2EXE_FLAGS) cp $@ $(CDROM_ROOT) -#~ emulator: -#~ export PATH=$$PATH:$(EMULATOR_DIR) -#~ $(EMULATOR) -cdfile $(PROJECT_DIR)/Bin/$(PROJECT).bin $(EMULATOR_FLAGS) +run: $(BIN_TARGET_PATH)/$(PROJECT).bin + export PATH=$$PATH:$(EMULATOR_DIR) + $(EMULATOR) -cdfile $(PROJECT_DIR)/Bin/$(PROJECT).bin $(EMULATOR_FLAGS) $(OBJ_SPRITES_PATH)/%.TIM: $(SRC_SPRITES_PATH)/%.bmp $(SRC_SPRITES_PATH)/%.flags $(BMP2TIM) $< $@ `cat $(word 2,$^)` @@ -184,4 +183,4 @@ clean_music: # ---------------------------------------- # Phony targets # ---------------------------------------- -.PHONY: build sounds clean music levels tiles +.PHONY: sounds clean music |