Browse Source

Added bin2c executable.

Branimir Karadžić 9 years ago
parent
commit
d0e3e2f2e9
5 changed files with 22 additions and 3 deletions
  1. 17 3
      makefile
  2. 5 0
      scripts/bin2c.lua
  3. BIN
      tools/bin/darwin/bin2c
  4. BIN
      tools/bin/linux/bin2c
  5. BIN
      tools/bin/windows/bin2c.exe

+ 17 - 3
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)
 

+ 5 - 0
scripts/bin2c.lua

@@ -16,4 +16,9 @@ project "bin2c"
 		"../tools/bin2c/**.h",
 	}
 
+	configuration { "mingw-*" }
+		targetextension ".exe"
+
 	configuration {}
+
+	strip()

BIN
tools/bin/darwin/bin2c


BIN
tools/bin/linux/bin2c


BIN
tools/bin/windows/bin2c.exe