Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lib JPEG improvements #71

Merged
merged 3 commits into from
Aug 2, 2021
Merged

Lib JPEG improvements #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd5901c
Replace custom libjpeg for latest version using original sources
fjtrujy Jul 29, 2021
4ff95ae
Create addons jpg functionally to make easier homebrew migratrions
fjtrujy Jul 30, 2021
9f43a06
Remove samples from external libraries
fjtrujy Aug 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.PHONY: aalib cmakelibs expat libconfig libid3tag libjpeg libmad libmikmod libtap libtiff lua madplay ode romfs sdl sdlgfx sdlimage sdlmixer sdlttf
.PHONY: aalib cmakelibs expat libconfig libid3tag libjpeg_ps2_addons libmad libmikmod libtap libtiff lua madplay ode romfs sdl sdlgfx sdlimage sdlmixer sdlttf

ifneq ("$(wildcard $(GSKIT)/include/gsKit.h)","")
all: libraries
libraries: aalib cmakelibs expat libconfig libid3tag libjpeg libmad libmikmod libtap libtiff lua madplay romfs sdl sdlgfx sdlimage sdlmixer sdlttf
libraries: aalib cmakelibs expat libconfig libid3tag libjpeg_ps2_addons libmad libmikmod libtap libtiff lua madplay romfs sdl sdlgfx sdlimage sdlmixer sdlttf
# ode
else
all: libraries
libraries: aalib cmakelibs expat libconfig libid3tag libjpeg libmad libmikmod libtap libtiff lua madplay romfs
libraries: aalib cmakelibs expat libconfig libid3tag libjpeg_ps2_addons libmad libmikmod libtap libtiff lua madplay romfs
# ode
@echo "GSKIT not set and gsKit not installed.\nSDL libraries were not built."
endif
Expand Down Expand Up @@ -34,7 +34,7 @@ libid3tag: cmakelibs
$(MAKE) -C $@ install
$(MAKE) -C $@ clean

libjpeg: cmakelibs
libjpeg_ps2_addons: cmakelibs
$(MAKE) -C $@ all
$(MAKE) -C $@ install
$(MAKE) -C $@ clean
Expand Down Expand Up @@ -86,7 +86,7 @@ romfs:
$(MAKE) -C $@ install
$(MAKE) -C $@ clean

sdl: libjpeg
sdl: cmakelibs
$(MAKE) -C $@
$(MAKE) -C $@ install
$(MAKE) -C $@ clean
Expand Down Expand Up @@ -114,11 +114,9 @@ sdlttf: sdl cmakelibs
sample:
$(MAKE) -C aalib sample
$(MAKE) -C libmikmod sample
$(MAKE) -C libpng sample
$(MAKE) -C sdl sample
$(MAKE) -C sdlgfx sample
$(MAKE) -C sdlmixer sample
$(MAKE) -C zlib sample
$(MAKE) -C lua sample platform=PS2
# Broken samples
# $(MAKE) -C ode sample
Expand Down
4 changes: 3 additions & 1 deletion build-cmakelibs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ cd build
##
git clone --depth 1 -b v1.2.11 https://github.com/madler/zlib || { exit 1; }
git clone --depth 1 -b v1.6.37 https://github.com/glennrp/libpng || { exit 1; }
git clone --depth 1 -b VER-2-10-4 https://github.com/freetype/freetype.git || { exit 1; }
git clone --depth 1 -b VER-2-10-4 https://github.com/freetype/freetype || { exit 1; }
git clone --depth 1 -b 0.2.5 https://github.com/yaml/libyaml || { exit 1; }
git clone --depth 1 -b 2.1.0 https://github.com/libjpeg-turbo/libjpeg-turbo || { exit 1; }

##
## Build cmake projects
Expand All @@ -50,4 +51,5 @@ build zlib "-DUNIX:BOOL=ON"
build libpng "-DPNG_SHARED=OFF -DPNG_STATIC=ON"
build freetype
build libyaml
build libjpeg-turbo "-DCMAKE_BUILD_TYPE=Release -DENABLE_SHARED=FALSE -DWITH_SIMD=0"
cd ..
82 changes: 0 additions & 82 deletions libjpeg/COPYING
View file
Open in desktop

This file was deleted.

111 changes: 0 additions & 111 deletions libjpeg/include/jconfig.h
View file
Open in desktop

This file was deleted.

Loading