Skip to content

Commit fef31a1

Browse files
committed
Modify:Add sixpack OS X build process to the makefile.As aPLib OS X library is added into the project.Building sixpack becomes possible.
Known Issue:sixpack dynamicly loading a windows platform only image process library called CxImage(http://www.codeproject.com/Articles/1300/CxImage).This library is not ported to Mac OS X.So sixpack is compilable/linkable but not be able to run until CxImage is ported to this platform.So I have commented the line of sixpack building on OS X platform from the makefile.For anyone who want to test it,uncomment that line yourself,please.
1 parent ab45bf3 commit fef31a1

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

Makefile

+12
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ ZASM_PLATFORM_TARGET=$(TOOLSDIR)/zasm_osx
8585
TOOLS+=$(TOOLSDIR)/zasm
8686
TOOLS+=$(TOOLSDIR)/vgm_cmp
8787
TOOLS+=$(TOOLSDIR)/appack
88+
#TOOLS+=$(TOOLSDIR)/sixpack
8889
else
8990
TOOLS+=$(TOOLSDIR)/sixpack
9091
TOOLS+=$(TOOLSDIR)/appack
@@ -216,6 +217,9 @@ SIXPACK_PKG=work/sixpack-13.zip
216217
work/sixpack-13.zip:
217218
#cd work && $(MGET) http://jiggawatt.org/badc0de/sixpack/sixpack-13.zip
218219
cp files/`basename $@` $@
220+
ifeq ($(UNAME), Darwin)
221+
cp files/sixpack-extra.zip work/sixpack-extra.zip
222+
endif
219223

220224
VGMTOOL_PKG=work/VGMTools_src.zip
221225
work/VGMTools_src.zip:
@@ -316,7 +320,15 @@ $(TOOLSDIR)/sixpack: $(SIXPACK_PKG)
316320
- mkdir -p work/sixpack && \
317321
cd work/sixpack && \
318322
unzip ../sixpack-13.zip
323+
ifeq ($(UNAME), Linux)
319324
cp work/sixpack/sixpack-12/bin/sixpack $@
325+
else ifeq ($(UNAME), Darwin)
326+
cd work/sixpack/sixpack-12 && \
327+
unzip ../../sixpack-extra.zip
328+
cd work/sixpack/sixpack-12/src && \
329+
clang++ -stdlib=libc++ cximage.cpp dib.cpp lzss.cpp neuquant.cpp octree.cpp main.cpp ../libs/aplib.a -o ../bin/sixpack_osx
330+
cp work/sixpack/sixpack-12/bin/sixpack_osx $@
331+
endif
320332
chmod +x $@
321333

322334
#genres $(TOOLSDIR)/genres: genres_01.zip

files/sixpack-extra.zip

6.86 KB
Binary file not shown.

0 commit comments

Comments
 (0)