diff --git a/makefile b/makefile index 685479b..7348046 100644 --- a/makefile +++ b/makefile @@ -213,14 +213,28 @@ BUILD_TOOLS_CONFIG=release32 EXE=.exe endif -.build/$(BUILD_OUTPUT_DIR)/bin/bin2cRelease$(EXE): .build/projects/$(BUILD_PROJECT_DIR) - $(SILENT) make -C .build/projects/$(BUILD_PROJECT_DIR) -f bin2c.make config=$(BUILD_TOOLS_CONFIG) +.build/osx64_clang/bin/bin2cRelease: .build/projects/gmake-osx + $(SILENT) make -C .build/projects/gmake-osx bin2c config=$(BUILD_TOOLS_CONFIG) -tools/bin/$(OS)/bin2c$(EXE): .build/$(BUILD_OUTPUT_DIR)/bin/bin2cRelease$(EXE) +tools/bin/darwin/bin2c: .build/osx64_clang/bin/bin2cRelease + $(SILENT) cp $(<) $(@) + +.build/linux64_gcc/bin/bin2cRelease: .build/projects/gmake-linux + $(SILENT) make -C .build/projects/gmake-linux bin2c config=$(BUILD_TOOLS_CONFIG) + +tools/bin/linux/bin2c: .build/linux64_gcc/bin/bin2cRelease + $(SILENT) cp $(<) $(@) + +.build/win64_mingw-gcc/bin/bin2cRelease.exe: .build/projects/gmake-mingw-gcc + $(SILENT) make -C .build/projects/gmake-mingw-gcc bin2c config=$(BUILD_TOOLS_CONFIG) + +tools/bin/windows/bin2c.exe: .build/win64_mingw-gcc/bin/bin2cRelease $(SILENT) cp $(<) $(@) tools: tools/bin/$(OS)/bin2c$(EXE) +dist: tools/bin/darwin/bin2c tools/bin/linux/bin2c tools/bin/windows/bin2c.exe + .build/$(BUILD_OUTPUT_DIR)/bin/bx.testRelease$(EXE): .build/projects/$(BUILD_PROJECT_DIR) $(SILENT) make -C .build/projects/$(BUILD_PROJECT_DIR) bx.test config=$(BUILD_TOOLS_CONFIG) diff --git a/scripts/bin2c.lua b/scripts/bin2c.lua index 39f193f..82b3a7a 100644 --- a/scripts/bin2c.lua +++ b/scripts/bin2c.lua @@ -16,4 +16,9 @@ project "bin2c" "../tools/bin2c/**.h", } + configuration { "mingw-*" } + targetextension ".exe" + configuration {} + + strip() diff --git a/tools/bin/darwin/bin2c b/tools/bin/darwin/bin2c new file mode 100755 index 0000000..eb1fa8e Binary files /dev/null and b/tools/bin/darwin/bin2c differ diff --git a/tools/bin/linux/bin2c b/tools/bin/linux/bin2c new file mode 100755 index 0000000..b862dae Binary files /dev/null and b/tools/bin/linux/bin2c differ diff --git a/tools/bin/windows/bin2c.exe b/tools/bin/windows/bin2c.exe new file mode 100755 index 0000000..143fffd Binary files /dev/null and b/tools/bin/windows/bin2c.exe differ