summaryrefslogtreecommitdiff
path: root/compile/linux/Makefile
diff options
context:
space:
mode:
authorpixel <pixel>2006-02-02 11:01:12 +0000
committerpixel <pixel>2006-02-02 11:01:12 +0000
commitd05884755c37c131b610c6ce1aef2201d99a10f5 (patch)
treea3f87af1b0d234748b7a65530e3b7718f78ec294 /compile/linux/Makefile
parent6c6c434f6cc79aa3b9f01d8d5d7b2d538ee68942 (diff)
Fixing old Dalos, and fixing Linux compilation.
Diffstat (limited to 'compile/linux/Makefile')
-rw-r--r--compile/linux/Makefile33
1 files changed, 17 insertions, 16 deletions
diff --git a/compile/linux/Makefile b/compile/linux/Makefile
index 9aae0c7..a518356 100644
--- a/compile/linux/Makefile
+++ b/compile/linux/Makefile
@@ -17,8 +17,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../..
+-I../../mogltk/include -I../../Dalos \
+-I../.. `sdl-config --cflags`
CPPFLAGS += $(INCLUDES) -O4 -DSTDC_HEADERS -DREADLINE_STATIC -DHAVE_UNISTD_H -fexceptions `sdl-config --cflags` -DWORDS_LITTLEENDIAN -fexceptions
@@ -29,18 +29,19 @@ vpath %.c ../../Dalos:../../:../../mogltk/lib:../../generic/lib:../../lib:../../
vpath %.cc ../../Dalos:../../:../../mogltk/lib:../../generic/lib:../../lib:../../psxdev:../../generic/lib/zlib/src:../../generic/lib/lua/src:../../generic/lib/lua/src/LuaLib
vpath %.cpp ../../Dalos:../../:../../mogltk/lib:../../generic/lib:../../lib:../../psxdev:../../generic/lib/zlib/src:../../generic/lib/lua/src:../../generic/lib/lua/src/LuaLib
-SOURCES = \
-cd-tool.cpp
-#Dalos.cpp
+CD_TOOL_SOURCES = cd-tool.cpp
-MOGLTK_SOURCES =
-#base.cc glwidgets.cc \
-#engine.cc mcolor.cc \
-#font.cc shape.cc \
-#glbase.cc sprite.cc \
-#glfont.cc texture.cc \
-#glshape.cc widgets.cc \
-#glsprite.cc
+DALOS_SOURCES = Dalos.cc Console.cc Hexview.cc
+
+MOGLTK_SOURCES = \
+base.cc glwidgets.cc \
+engine.cc mcolor.cc \
+font.cc shape.cc \
+glbase.cc sprite.cc \
+glfont.cc texture.cc \
+glshape.cc widgets.cc \
+glsprite.cc contextmenu.cc \
+inputtext.cc
BALTISOT_SOURCES = \
Image.cc Main.cc \
@@ -105,14 +106,14 @@ $(BALTISOT_SOURCES) $(ZLIB_SOURCES) $(REGEX_SOURCES) $(GETOPT_SOURCES) \
$(LUA_SOURCES) $(PSX_SOURCES) $(PSXDEV_SOURCES) $(READLINE_SOURCES) \
$(HASH_SOURCES)
-WHOLE_SOURCES = $(SOURCES) $(COMMON_SOURCES) $(MOGLTK_SOURCES)
+WHOLE_SOURCES = $(CD_TOOL_SOURCES) $(DALOS_SOURCES) $(COMMON_SOURCES) $(MOGLTK_SOURCES)
ALL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(WHOLE_SOURCES))))
ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES))))
-DALOS_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES) $(MOGLTK_SOURCES)))) Dalos.o
+DALOS_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES) $(MOGLTK_SOURCES) $(DALOS_SOURCES))))
-CD_TOOL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES)))) cd-tool.o
+CD_TOOL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES) $(CD_TOOL_SOURCES))))
all: dep cd-tool cd-tool-static