mirror of
https://github.com/digarok/gsplus.git
synced 2024-09-30 04:57:58 +00:00
attempt to clean some make inconsistencies
This commit is contained in:
parent
f0a0488f7a
commit
0bbfc94967
74
src/Makefile
74
src/Makefile
@ -26,16 +26,50 @@ clean:
|
|||||||
- rm -f compile_time.o
|
- rm -f compile_time.o
|
||||||
- rm -f 8inst_c.h
|
- rm -f 8inst_c.h
|
||||||
- rm -f 16inst_c.h
|
- rm -f 16inst_c.h
|
||||||
- rm -rf ../GSport.app
|
|
||||||
- rm -rf ../GSportDmg
|
|
||||||
|
|
||||||
specials: 8inst_s 16inst_s 8size 16size 8inst_c 16inst_c size_c size_s
|
specials: 8inst_s 16inst_s 8size 16size 8inst_c 16inst_c size_c size_s
|
||||||
|
|
||||||
specials_clean:
|
specials_clean:
|
||||||
rm -f 8inst_s 16inst_s 8size 16size 8inst_c 16inst_c size_c size_s
|
rm -f 8inst_s 16inst_s 8size 16size 8inst_c 16inst_c size_c size_s
|
||||||
|
|
||||||
|
# Linux/OSX SDL builds
|
||||||
|
gsplus: $(OBJECTS) compile_time.o
|
||||||
|
$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS)
|
||||||
|
echo $(OBJECTS)
|
||||||
|
cp gsplus ..
|
||||||
|
cp gsplus ../bin/osx
|
||||||
|
|
||||||
# Mac builds:
|
# Linux/OSX XWindows builds
|
||||||
|
gsplusx: $(OBJECTS) compile_time.o
|
||||||
|
$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(XLIBS) $(EXTRA_LIBS) -lX11
|
||||||
|
echo $(OBJECTS)
|
||||||
|
mv gsplusx ..
|
||||||
|
|
||||||
|
# NOT CURRENTLY SUPPORTED
|
||||||
|
# Linux framebuffer builds:
|
||||||
|
gsplusfb: $(OBJECTS) compile_time.o
|
||||||
|
$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS)
|
||||||
|
echo $(OBJECTS)
|
||||||
|
mv gsplusfb ..
|
||||||
|
cp -f ../config.template ../config.txt
|
||||||
|
|
||||||
|
# NOT CURRENTLY SUPPORTED
|
||||||
|
# Mingw32 (native windows) builds:
|
||||||
|
gsport.exe: $(OBJECTS) compile_time.o
|
||||||
|
g++ $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) -lwinmm -lgdi32 -ldsound -lcomctl32 -lws2_32 -lshell32
|
||||||
|
mkdir -p ../GSport.app/lib
|
||||||
|
cp -f gsport.exe ../GSport.app/GSport.exe
|
||||||
|
cp -f ../config.template ../GSport.app/config.txt
|
||||||
|
cp -f ../lib/*.ttf ../GSport.app/lib
|
||||||
|
cp -f ../lib/arch/win32/*.dll ../GSport.app
|
||||||
|
cp -f ../lib/NoBoot.po ../GSport.app
|
||||||
|
cp -f GSport.bat ../GSport.app/GSport.bat
|
||||||
|
cp -f parallel.rom ../GSport.app
|
||||||
|
cp -f ../COPYING.txt ../GSport.app
|
||||||
|
cp -f ../GSport.html ../GSport.app
|
||||||
|
|
||||||
|
# NOT CURRENTLY SUPPORTED
|
||||||
|
# Mac build - old style (deprecated)
|
||||||
gsportmac: $(OBJECTS) compile_time.o
|
gsportmac: $(OBJECTS) compile_time.o
|
||||||
$(CC) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o gsport $(EXTRA_LIBS)
|
$(CC) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o gsport $(EXTRA_LIBS)
|
||||||
mkdir -p ../GSport.app/Contents/Resources/English.lproj/main.nib
|
mkdir -p ../GSport.app/Contents/Resources/English.lproj/main.nib
|
||||||
@ -61,40 +95,6 @@ gsportmac: $(OBJECTS) compile_time.o
|
|||||||
cp ../GSport.html ../GSportDmg/GSport/GSport.html
|
cp ../GSport.html ../GSportDmg/GSport/GSport.html
|
||||||
arch/mac/makedmg.sh .. GSportDmg GSport GSport 7
|
arch/mac/makedmg.sh .. GSportDmg GSport GSport 7
|
||||||
|
|
||||||
# OSX builds
|
|
||||||
gsplus: $(OBJECTS) compile_time.o
|
|
||||||
$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS)
|
|
||||||
echo $(OBJECTS)
|
|
||||||
cp gsplus ..
|
|
||||||
cp gsplus ../bin/osx
|
|
||||||
|
|
||||||
# Linux/OSX XWindows builds
|
|
||||||
gsportx: $(OBJECTS) compile_time.o
|
|
||||||
$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(XLIBS) $(EXTRA_LIBS) -lX11
|
|
||||||
echo $(OBJECTS)
|
|
||||||
mv gsportx ..
|
|
||||||
|
|
||||||
# Linux framebuffer builds:
|
|
||||||
gsportfb: $(OBJECTS) compile_time.o
|
|
||||||
$(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS)
|
|
||||||
echo $(OBJECTS)
|
|
||||||
mv gsportfb ..
|
|
||||||
cp -f ../config.template ../config.txt
|
|
||||||
|
|
||||||
# Mingw32 (native windows) builds:
|
|
||||||
gsport.exe: $(OBJECTS) compile_time.o
|
|
||||||
g++ $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) -lwinmm -lgdi32 -ldsound -lcomctl32 -lws2_32 -lshell32
|
|
||||||
mkdir -p ../GSport.app/lib
|
|
||||||
cp -f gsport.exe ../GSport.app/GSport.exe
|
|
||||||
cp -f ../config.template ../GSport.app/config.txt
|
|
||||||
cp -f ../lib/*.ttf ../GSport.app/lib
|
|
||||||
cp -f ../lib/arch/win32/*.dll ../GSport.app
|
|
||||||
cp -f ../lib/NoBoot.po ../GSport.app
|
|
||||||
cp -f GSport.bat ../GSport.app/GSport.bat
|
|
||||||
cp -f parallel.rom ../GSport.app
|
|
||||||
cp -f ../COPYING.txt ../GSport.app
|
|
||||||
cp -f ../GSport.html ../GSport.app
|
|
||||||
|
|
||||||
8inst_c.h: instable.h
|
8inst_c.h: instable.h
|
||||||
$(PERL) make_inst c 8 instable.h > 8inst_c.h
|
$(PERL) make_inst c 8 instable.h > 8inst_c.h
|
||||||
|
|
||||||
|
@ -1,21 +1,20 @@
|
|||||||
TARGET = gsportx
|
TARGET = gsplusx
|
||||||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
|
NAME = gsportx
|
||||||
|
PERL = perl
|
||||||
CC = clang
|
CC = clang
|
||||||
#CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -arch=i686 -DHAVE_SDL -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS -I/usr/include/SDL -I/usr/include/freetype2
|
LD = g++
|
||||||
#CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -DHAVE_ATBRIDGE -I/usr/include/freetype2 -I/usr/include/SDL2
|
AS = cc
|
||||||
|
|
||||||
|
|
||||||
|
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
|
||||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -I/usr/local/include/freetype2 -L/usr/X11/lib
|
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -I/usr/local/include/freetype2 -L/usr/X11/lib
|
||||||
CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2
|
CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2
|
||||||
OPTS = -DGSPORT_LITTLE_ENDIAN
|
OPTS = -DGSPORT_LITTLE_ENDIAN
|
||||||
SUFFIX =
|
SUFFIX =
|
||||||
NAME = gsportx
|
|
||||||
LDFLAGS =
|
LDFLAGS =
|
||||||
LDOPTS =
|
LDOPTS =
|
||||||
LD = g++
|
|
||||||
EXTRA_LIBS = -lX11 -lfreetype -lSDL2 -lpcap -lXext
|
EXTRA_LIBS = -lX11 -lfreetype -lSDL2 -lpcap -lXext
|
||||||
EXTRA_SPECIALS =
|
EXTRA_SPECIALS =
|
||||||
|
|
||||||
AS = cc
|
|
||||||
PERL = perl
|
|
||||||
|
|
||||||
XOPTS = -I/usr/X11/include
|
XOPTS = -I/usr/X11/include
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
TARGET = gsportfb
|
TARGET = gsplusfb
|
||||||
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) fbdriver.o
|
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) fbdriver.o
|
||||||
CC = gcc
|
CC = gcc
|
||||||
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6
|
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=armv6
|
@ -1,5 +1,5 @@
|
|||||||
TARGET = gsportx
|
TARGET = gsplusx
|
||||||
NAME = gsportx
|
NAME = gsplusx
|
||||||
PERL = perl
|
PERL = perl
|
||||||
CC = gcc
|
CC = gcc
|
||||||
LD = g++
|
LD = g++
|
||||||
|
Loading…
Reference in New Issue
Block a user