summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpixel <pixel>2004-07-23 23:21:05 +0000
committerpixel <pixel>2004-07-23 23:21:05 +0000
commitd2bb3284367130dc9e3b8adb3f90e8c36bbd907b (patch)
tree010d2f0f37cdf92d7124ec43e87a7ff103a4ac39
parentf19d111681d20a88fd31ea87fecbdcc39cc1b707 (diff)
Changed static makefiles to match new Dalos's requirements
-rw-r--r--compile/linux/Makefile23
-rw-r--r--compile/win32/Makefile13
2 files changed, 18 insertions, 18 deletions
diff --git a/compile/linux/Makefile b/compile/linux/Makefile
index 03956b0..018c4bf 100644
--- a/compile/linux/Makefile
+++ b/compile/linux/Makefile
@@ -7,6 +7,7 @@ INCLUDES = -I../../includes -I../../psxdev -I../../generic/include \
-I../../generic/lib/zlib/include \
-I../../generic/lib/lua/include -I../../generic/lib/lua/includes \
-I../../mogltk/include \
+-I../.. \
`sdl-config --cflags`
CPPFLAGS = $(INCLUDES) -O4 -march=i686 -DSTDC_HEADERS -DREADLINE_STATIC -DHAVE_UNISTD_H
@@ -87,7 +88,7 @@ DALOS_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES) $(MOGLTK_S
CD_TOOL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES)))) cd-tool.o
-all: cd-tool cd-tool-static
+all: cd-tool cd-tool-static Dalos Dalos-static
stats:
@wc $(WHOLE_SOURCES)
@@ -95,33 +96,31 @@ stats:
dist: all ../../cd-tool.lua ../../FAQ-cd.txt ../../COPYING
zip -j9 ../cd-tool-`date +%Y%m%d`-linux-dynamic.zip cd-tool ../../cd-tool.lua ../../FAQ-cd.txt ../../COPYING
zip -j9 ../cd-tool-`date +%Y%m%d`-linux-static.zip cd-tool-static ../../cd-tool.lua ../../FAQ-cd.txt ../../COPYING
- #zip -j9 ../Dalos-`date +%Y%m%d`-linux-dynamic.zip Dalos ../../COPYING
- #zip -j9 ../Dalos-`date +%Y%m%d`-linux-static.zip Dalos-static ../../COPYING
+ zip -j9 ../Dalos-`date +%Y%m%d`-linux-dynamic.zip Dalos ../../Dalos/Dalos.paq ../../COPYING
+ zip -j9 ../Dalos-`date +%Y%m%d`-linux-static.zip Dalos-static ../../Dalos/Dalos.paq ../../COPYING
Dalos: $(DALOS_OBJECTS)
- $(LD) $(LDFLAGS) -o Dalos $(DALOS_OBJECTS) -lGL -lGLU
+ $(LD) -o Dalos $(DALOS_OBJECTS) -lGL -lGLU -lreadline -lSDL -lpthread
$(STRIP) Dalos
- upx-nrv Dalos
- cat ../../Dalos/Dalos.paq >> Dalos
+ upx-nrv -9 Dalos
Dalos-static: $(DALOS_OBJECTS)
- $(LD) $(LDFLAGS) -o Dalos-static $(DALOS_OBJECTS) -lGL -lGLU -static
+ $(LD) -o Dalos-static $(DALOS_OBJECTS) -lGL -lGLU -lreadline -lSDL -lpthread -static -laa -lgpm -lncurses -lX11 -lslang -lXext -ldl -lvga -lasound -L/usr/X11R6/lib
$(STRIP) Dalos-static
- #upx-nrv Dalos-static
- cat ../../Dalos/Dalos.paq >> Dalos-static
+ upx-nrv -9 Dalos-static
cd-tool: $(CD_TOOL_OBJECTS)
$(LD) $(LDFLAGS) -o cd-tool $(CD_TOOL_OBJECTS) -lreadline -lncurses
$(STRIP) cd-tool
- upx-nrv cd-tool
+ upx-nrv -9 cd-tool
cd-tool-static: $(CD_TOOL_OBJECTS)
$(LD) $(LDFLAGS) -o cd-tool-static $(CD_TOOL_OBJECTS) -lreadline -lncurses -static
$(STRIP) cd-tool-static
- upx-nrv cd-tool-static
+ upx-nrv -9 cd-tool-static
clean:
- rm -f *.exe *.o
+ rm -f Dalos Dalos-static cd-tool cd-tool-static *.o
diff --git a/compile/win32/Makefile b/compile/win32/Makefile
index d1e19d7..2938ad2 100644
--- a/compile/win32/Makefile
+++ b/compile/win32/Makefile
@@ -8,7 +8,8 @@ INCLUDES = -I../../includes -I../../psxdev -I../../generic/include \
-I../../generic/lib/zlib/include \
-I../../generic/lib/lua/include -I../../generic/lib/lua/includes \
-I../../mogltk/include \
--I/usr/local/cross-tools/i386-mingw32msvc/include/SDL
+-I/usr/local/cross-tools/i386-mingw32msvc/include/SDL \
+-I../..
CPPFLAGS = $(INCLUDES) -O4 -march=i686 -DSTDC_HEADERS -DREADLINE_STATIC
@@ -99,20 +100,20 @@ all: cd-tool.exe Dalos.exe
stats:
@wc $(WHOLE_SOURCES)
-dist: all SDL.dll ../../cd-tool.lua ../../COPYING ../../FAQ-cd.txt
+dist: all README-SDL.txt SDL.dll ../../cd-tool.lua ../../COPYING ../../FAQ-cd.txt
zip -j9 ../cd-tool-`date +%Y%m%d`-win32.zip cd-tool.exe ../../cd-tool.lua ../../FAQ-cd.txt ../../COPYING
- zip -j9 ../Dalos-`date +%Y%m%d`-win32.zip Dalos.exe ../../COPYING
+ zip -j9 ../Dalos-`date +%Y%m%d`-win32.zip Dalos.exe ../../COPYING README-SDL.txt SDL.dll
Dalos.exe: $(DALOS_OBJECTS)
- $(LD) $(LDFLAGS) -o Dalos.exe $(DALOS_OBJECTS) -lmingw32 -L/usr/local/cross-tools/i386-mingw32msvc/lib -lmingw32 -lSDLmain -lSDL -mwindows -lopengl32 -lglu32
+ $(LD) $(LDFLAGS) -o Dalos.exe $(DALOS_OBJECTS) -lmingw32 -L/usr/local/cross-tools/i386-mingw32msvc/lib -lmingw32 -lSDLmain -lSDL -mwindows -lopengl32 -lglu32 ../../libreadline-static.a
$(STRIP) Dalos.exe
- upx-nrv Dalos.exe
+ upx-nrv -9 Dalos.exe
cat ../../Dalos/Dalos.paq >> Dalos.exe
cd-tool.exe: $(CD_TOOL_OBJECTS)
$(LD) $(LDFLAGS) -o cd-tool.exe $(CD_TOOL_OBJECTS) ../../libreadline-static.a -mconsole
$(STRIP) cd-tool.exe
- upx-nrv cd-tool.exe
+ upx-nrv -9 cd-tool.exe
clean:
rm -f *.exe *.o