Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Why was this not using LF endings!

Browse Source
This commit is contained in:
jonpas 2016-07-11 16:30:51 +02:00
parent fd39ee9e6b
commit 2f6a20bcc1
2 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Makefile
View File

@ -1,31 +1,31 @@
MAJOR = $(shell grep "^\#define[[:space:]]*MAJOR" addons/main/script_mod.hpp | egrep -m 1 -o '[[:digit:]]+')
MINOR = $(shell grep "^\#define[[:space:]]*MINOR" addons/main/script_mod.hpp | egrep -m 1 -o '[[:digit:]]+')
PATCH = $(shell grep "^\#define[[:space:]]*PATCHLVL" addons/main/script_mod.hpp | egrep -m 1 -o '[[:digit:]]+')
BUILD = $(shell grep "^\#define[[:space:]]*BUILD" addons/main/script_mod.hpp | egrep -m 1 -o '[[:digit:]]+')
VERSION = $(MAJOR).$(MINOR).$(PATCH)
VERSION_FULL = $(VERSION).$(BUILD)
PREFIX = ace
BIN = @ace
ZIP = ace3
MAJOR = $(shell grep "^\#define[[:space:]]*MAJOR" addons/main/script_mod.hpp | egrep -m 1 -o '[[:digit:]]+')
MINOR = $(shell grep "^\#define[[:space:]]*MINOR" addons/main/script_mod.hpp | egrep -m 1 -o '[[:digit:]]+')
PATCH = $(shell grep "^\#define[[:space:]]*PATCHLVL" addons/main/script_mod.hpp | egrep -m 1 -o '[[:digit:]]+')
BUILD = $(shell grep "^\#define[[:space:]]*BUILD" addons/main/script_mod.hpp | egrep -m 1 -o '[[:digit:]]+')
VERSION = $(MAJOR).$(MINOR).$(PATCH)
VERSION_FULL = $(VERSION).$(BUILD)
PREFIX = ace
BIN = @ace
ZIP = ace3
CBA = tools/cba
FLAGS = -i $(CBA) -w unquoted-string -w redefinition-wo-undef
$(BIN)/addons/$(PREFIX)_%.pbo: addons/%
$(BIN)/addons/$(PREFIX)_%.pbo: addons/%
@mkdir -p $(BIN)/addons
@echo " PBO $@"
@armake build ${FLAGS} -f $< $@
$(BIN)/optionals/$(PREFIX)_%.pbo: optionals/%
$(BIN)/optionals/$(PREFIX)_%.pbo: optionals/%
@mkdir -p $(BIN)/optionals
@echo " PBO $@"
@armake build ${FLAGS} -f $< $@
# Shortcut for building single addons (eg. "make <component>.pbo")
# Shortcut for building single addons (eg. "make <component>.pbo")
%.pbo:
"$(MAKE)" $(MAKEFLAGS) $(patsubst %, $(BIN)/addons/$(PREFIX)_%, $@)
"$(MAKE)" $(MAKEFLAGS) $(patsubst %, $(BIN)/addons/$(PREFIX)_%, $@)
all: $(patsubst addons/%, $(BIN)/addons/$(PREFIX)_%.pbo, $(wildcard addons/*)) \
$(patsubst optionals/%, $(BIN)/optionals/$(PREFIX)_%.pbo, $(wildcard optionals/*))
all: $(patsubst addons/%, $(BIN)/addons/$(PREFIX)_%.pbo, $(wildcard addons/*)) \
$(patsubst optionals/%, $(BIN)/optionals/$(PREFIX)_%.pbo, $(wildcard optionals/*))
filepatching:
"$(MAKE)" $(MAKEFLAGS) FLAGS="-i $(CBA) -w unquoted-string -p"
@ -35,16 +35,16 @@ $(BIN)/keys/%.biprivatekey:
@echo " KEY $@"
@armake keygen -f $(patsubst $(BIN)/keys/%.biprivatekey, $(BIN)/keys/%, $@)
$(BIN)/addons/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION_FULL).bisign: $(BIN)/addons/$(PREFIX)_%.pbo $(BIN)/keys/$(PREFIX)_$(VERSION_FULL).biprivatekey
$(BIN)/addons/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION_FULL).bisign: $(BIN)/addons/$(PREFIX)_%.pbo $(BIN)/keys/$(PREFIX)_$(VERSION_FULL).biprivatekey
@echo " SIG $@"
@armake sign -f $(BIN)/keys/ace_$(VERSION_FULL).biprivatekey $<
@armake sign -f $(BIN)/keys/ace_$(VERSION_FULL).biprivatekey $<
$(BIN)/optionals/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION_FULL).bisign: $(BIN)/optionals/$(PREFIX)_%.pbo $(BIN)/keys/$(PREFIX)_$(VERSION_FULL).biprivatekey
$(BIN)/optionals/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION_FULL).bisign: $(BIN)/optionals/$(PREFIX)_%.pbo $(BIN)/keys/$(PREFIX)_$(VERSION_FULL).biprivatekey
@echo " SIG $@"
@armake sign -f $(BIN)/keys/$(PREFIX)_$(VERSION_FULL).biprivatekey $<
@armake sign -f $(BIN)/keys/$(PREFIX)_$(VERSION_FULL).biprivatekey $<
signatures: $(patsubst addons/%, $(BIN)/addons/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION_FULL).bisign, $(wildcard addons/*)) \
$(patsubst optionals/%, $(BIN)/optionals/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION_FULL).bisign, $(wildcard optionals/*))
signatures: $(patsubst addons/%, $(BIN)/addons/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION_FULL).bisign, $(wildcard addons/*)) \
$(patsubst optionals/%, $(BIN)/optionals/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION_FULL).bisign, $(wildcard optionals/*))
extensions: $(wildcard extensions/*/*)
cd extensions/build && cmake .. && make
@ -54,13 +54,13 @@ extensions-win64: $(wildcard extensions/*/*)
cd extensions/build && CXX=$(eval $(which g++-w64-mingw-i686)) cmake .. && make
clean:
rm -rf $(BIN) $(ZIP)_*.zip
rm -rf $(BIN) $(ZIP)_*.zip
release:
@"$(MAKE)" clean
@"$(MAKE)" $(MAKEFLAGS) signatures
@echo " ZIP ace3_$(VERSION).zip"
@cp *.dll LICENSE README.md AUTHORS.txt logo_ace3_ca.paa mod.cpp meta.cpp $(BIN)
@zip -r $(ZIP)_$(VERSION).zip $(BIN) &> /dev/null
@zip -r $(ZIP)_$(VERSION).zip $(BIN) &> /dev/null
.PHONY: release

48
make.bat
View File

@ -1,24 +1,24 @@
@echo off
setlocal enabledelayedexpansion
if not exist "@ace" mkdir "@ace"
if not exist "@ace\addons" mkdir "@ace\addons"
if not exist "@ace\optionals" mkdir "@ace\optionals"
if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set armake=tools\armake_w64.exe) else (set armake=tools\armake_w32.exe)
for /d %%f in (addons\*) do (
set folder=%%f
set name=!folder:addons\=!
echo PBO @ace\addons\ace_!name!.pbo
!armake! build -w unquoted-string -w redefinition-wo-undef -f !folder! @ace\addons\ace_!name!.pbo
)
for /d %%f in (optionals\*) do (
set folder=%%f
set name=!folder:optionals\=!
echo PBO @ace\optionals\ace_!name!.pbo
!armake! build -w unquoted-string -w redefinition-wo-undef -f !folder! @ace\optionals\ace_!name!.pbo
)
pause
@echo off
setlocal enabledelayedexpansion
if not exist "@ace" mkdir "@ace"
if not exist "@ace\addons" mkdir "@ace\addons"
if not exist "@ace\optionals" mkdir "@ace\optionals"
if "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set armake=tools\armake_w64.exe) else (set armake=tools\armake_w32.exe)
for /d %%f in (addons\*) do (
set folder=%%f
set name=!folder:addons\=!
echo PBO @ace\addons\ace_!name!.pbo
!armake! build -w unquoted-string -w redefinition-wo-undef -f !folder! @ace\addons\ace_!name!.pbo
)
for /d %%f in (optionals\*) do (
set folder=%%f
set name=!folder:optionals\=!
echo PBO @ace\optionals\ace_!name!.pbo
!armake! build -w unquoted-string -w redefinition-wo-undef -f !folder! @ace\optionals\ace_!name!.pbo
)
pause