From ec69297cd8779c460d9f69b23a926962eb7bfbcc Mon Sep 17 00:00:00 2001 From: Andrew Pamment Date: Sun, 19 Mar 2017 07:49:46 +1000 Subject: [PATCH] Added Magiedit to makefile --- Makefile.freebsd | 11 ++++++++- Makefile.freebsd.WWW | 11 ++++++++- Makefile.linux | 12 ++++++++-- Makefile.linux.WWW | 10 +++++++- Makefile.netbsd | 16 ++++++++++++- Makefile.netbsd.WWW | 15 +++++++++++- Makefile.osx | 11 ++++++++- Makefile.osx.WWW | 12 ++++++++-- {utils/magiedit => deps}/odoors/DOOR.CFG | 0 {utils/magiedit => deps}/odoors/DORINFO1.DEF | 0 {utils/magiedit => deps}/odoors/DOS.mak | 0 {utils/magiedit => deps}/odoors/GNUmakefile | 0 {utils/magiedit => deps}/odoors/ODApp.ico | Bin {utils/magiedit => deps}/odoors/ODAuto.c | 0 {utils/magiedit => deps}/odoors/ODBlock.c | 0 {utils/magiedit => deps}/odoors/ODCFile.c | 0 {utils/magiedit => deps}/odoors/ODCmdLn.c | 0 {utils/magiedit => deps}/odoors/ODCom.c | 0 {utils/magiedit => deps}/odoors/ODCom.h | 0 {utils/magiedit => deps}/odoors/ODCore.c | 0 {utils/magiedit => deps}/odoors/ODCore.h | 0 {utils/magiedit => deps}/odoors/ODDrBox.c | 0 {utils/magiedit => deps}/odoors/ODEdStr.c | 0 {utils/magiedit => deps}/odoors/ODEdit.c | 0 {utils/magiedit => deps}/odoors/ODEmu.c | 0 {utils/magiedit => deps}/odoors/ODFrame.c | 0 {utils/magiedit => deps}/odoors/ODFrame.h | 0 {utils/magiedit => deps}/odoors/ODGen.h | 0 {utils/magiedit => deps}/odoors/ODGetIn.c | 0 {utils/magiedit => deps}/odoors/ODGraph.c | 0 {utils/magiedit => deps}/odoors/ODInEx.h | 0 {utils/magiedit => deps}/odoors/ODInEx1.c | 0 {utils/magiedit => deps}/odoors/ODInEx2.c | 0 {utils/magiedit => deps}/odoors/ODInQue.c | 0 {utils/magiedit => deps}/odoors/ODInQue.h | 0 {utils/magiedit => deps}/odoors/ODInfo.ico | Bin {utils/magiedit => deps}/odoors/ODKrnl.c | 0 {utils/magiedit => deps}/odoors/ODKrnl.h | 0 {utils/magiedit => deps}/odoors/ODList.c | 0 {utils/magiedit => deps}/odoors/ODLog.c | 0 {utils/magiedit => deps}/odoors/ODMulti.c | 0 {utils/magiedit => deps}/odoors/ODOORS62.TXT | 0 {utils/magiedit => deps}/odoors/ODPCB.c | 0 {utils/magiedit => deps}/odoors/ODPlat.c | 0 {utils/magiedit => deps}/odoors/ODPlat.h | 0 {utils/magiedit => deps}/odoors/ODPopup.c | 0 {utils/magiedit => deps}/odoors/ODPrntf.c | 0 {utils/magiedit => deps}/odoors/ODRA.c | 0 {utils/magiedit => deps}/odoors/ODRes.aps | Bin {utils/magiedit => deps}/odoors/ODRes.h | 0 {utils/magiedit => deps}/odoors/ODRes.rc | 0 {utils/magiedit => deps}/odoors/ODScrn.c | 0 {utils/magiedit => deps}/odoors/ODScrn.h | 0 {utils/magiedit => deps}/odoors/ODSpawn.c | 0 {utils/magiedit => deps}/odoors/ODStand.c | 0 {utils/magiedit => deps}/odoors/ODStat.c | 0 {utils/magiedit => deps}/odoors/ODStat.h | 0 {utils/magiedit => deps}/odoors/ODStr.c | 0 {utils/magiedit => deps}/odoors/ODStr.h | 0 {utils/magiedit => deps}/odoors/ODSwap.asm | 0 {utils/magiedit => deps}/odoors/ODSwap.h | 0 {utils/magiedit => deps}/odoors/ODTypes.h | 0 {utils/magiedit => deps}/odoors/ODUtil.c | 0 {utils/magiedit => deps}/odoors/ODUtil.h | 0 {utils/magiedit => deps}/odoors/ODWCat.c | 0 {utils/magiedit => deps}/odoors/ODWin.c | 0 {utils/magiedit => deps}/odoors/ODoorW.lib | Bin {utils/magiedit => deps}/odoors/OPENDOOR.TXT | 0 {utils/magiedit => deps}/odoors/OpenDoor.def | 0 {utils/magiedit => deps}/odoors/OpenDoor.h | 0 {utils/magiedit => deps}/odoors/README.NIX | 0 {utils/magiedit => deps}/odoors/TODO-v7.txt | 0 {utils/magiedit => deps}/odoors/Toolbar.bmp | Bin {utils/magiedit => deps}/odoors/buildall.bat | 0 {utils/magiedit => deps}/odoors/builddos.bat | 0 {utils/magiedit => deps}/odoors/ex_chat.c | 0 {utils/magiedit => deps}/odoors/ex_diag.c | 0 {utils/magiedit => deps}/odoors/ex_hello.c | 0 {utils/magiedit => deps}/odoors/ex_music.c | 0 {utils/magiedit => deps}/odoors/ex_ski.c | 0 {utils/magiedit => deps}/odoors/ex_vote.c | 0 {utils/magiedit => deps}/odoors/hbuild.bat | 0 .../odoors/historic/ODHIST.TXT | 0 .../magiedit => deps}/odoors/historic/ODN.FRM | 0 .../magiedit => deps}/odoors/historic/ODN.NFO | 0 .../odoors/historic/ODTJ9304.TXT | 0 .../odoors/historic/ODTJ9305.TXT | 0 .../odoors/historic/ODTJ9402.TXT | 0 .../odoors/historic/ROLLCALL.TXT | 0 .../odoors/historic/odtips3/BPFIND.H | 0 .../odoors/historic/odtips3/CMDLINE.C | 0 .../odoors/historic/odtips3/CMDLINE.H | 0 .../odoors/historic/odtips3/FILEVIEW.C | 0 .../odoors/historic/odtips3/PAGEVIEW.C | 0 .../odoors/historic/odtips3/PAGEVIEW.H | 0 .../odoors/historic/odtips3/SUMMARY.TXT | 0 .../odoors/historic/odtips3/TIP1.C | 0 .../odoors/historic/odtips3/TIP1.TXT | 0 .../odoors/historic/odtips3/TIP2.C | 0 .../odoors/historic/odtips3/TIP2.TXT | 0 .../odoors/historic/odtips3/TIP3.TXT | 0 .../odoors/historic/odtips3/TIP4.C | 0 .../odoors/historic/odtips3/TIP4.TXT | 0 {utils/magiedit => deps}/odoors/lbuild.bat | 0 {utils/magiedit => deps}/odoors/license.txt | 0 {utils/magiedit => deps}/odoors/out.txt | 0 {utils/magiedit => deps}/odoors/sbuild.bat | 0 {utils/magiedit => deps}/odoors/wbuild.bat | 0 {utils/magiedit => deps}/odoors/win32.mak | 0 utils/magiedit/Makefile | 22 ++++++++++++++++++ utils/magiedit/build.sh | 7 ------ 111 files changed, 110 insertions(+), 17 deletions(-) rename {utils/magiedit => deps}/odoors/DOOR.CFG (100%) rename {utils/magiedit => deps}/odoors/DORINFO1.DEF (100%) rename {utils/magiedit => deps}/odoors/DOS.mak (100%) rename {utils/magiedit => deps}/odoors/GNUmakefile (100%) rename {utils/magiedit => deps}/odoors/ODApp.ico (100%) rename {utils/magiedit => deps}/odoors/ODAuto.c (100%) rename {utils/magiedit => deps}/odoors/ODBlock.c (100%) rename {utils/magiedit => deps}/odoors/ODCFile.c (100%) rename {utils/magiedit => deps}/odoors/ODCmdLn.c (100%) rename {utils/magiedit => deps}/odoors/ODCom.c (100%) rename {utils/magiedit => deps}/odoors/ODCom.h (100%) rename {utils/magiedit => deps}/odoors/ODCore.c (100%) rename {utils/magiedit => deps}/odoors/ODCore.h (100%) rename {utils/magiedit => deps}/odoors/ODDrBox.c (100%) rename {utils/magiedit => deps}/odoors/ODEdStr.c (100%) rename {utils/magiedit => deps}/odoors/ODEdit.c (100%) rename {utils/magiedit => deps}/odoors/ODEmu.c (100%) rename {utils/magiedit => deps}/odoors/ODFrame.c (100%) rename {utils/magiedit => deps}/odoors/ODFrame.h (100%) rename {utils/magiedit => deps}/odoors/ODGen.h (100%) rename {utils/magiedit => deps}/odoors/ODGetIn.c (100%) rename {utils/magiedit => deps}/odoors/ODGraph.c (100%) rename {utils/magiedit => deps}/odoors/ODInEx.h (100%) rename {utils/magiedit => deps}/odoors/ODInEx1.c (100%) rename {utils/magiedit => deps}/odoors/ODInEx2.c (100%) rename {utils/magiedit => deps}/odoors/ODInQue.c (100%) rename {utils/magiedit => deps}/odoors/ODInQue.h (100%) rename {utils/magiedit => deps}/odoors/ODInfo.ico (100%) rename {utils/magiedit => deps}/odoors/ODKrnl.c (100%) rename {utils/magiedit => deps}/odoors/ODKrnl.h (100%) rename {utils/magiedit => deps}/odoors/ODList.c (100%) rename {utils/magiedit => deps}/odoors/ODLog.c (100%) rename {utils/magiedit => deps}/odoors/ODMulti.c (100%) rename {utils/magiedit => deps}/odoors/ODOORS62.TXT (100%) rename {utils/magiedit => deps}/odoors/ODPCB.c (100%) rename {utils/magiedit => deps}/odoors/ODPlat.c (100%) rename {utils/magiedit => deps}/odoors/ODPlat.h (100%) rename {utils/magiedit => deps}/odoors/ODPopup.c (100%) rename {utils/magiedit => deps}/odoors/ODPrntf.c (100%) rename {utils/magiedit => deps}/odoors/ODRA.c (100%) rename {utils/magiedit => deps}/odoors/ODRes.aps (100%) rename {utils/magiedit => deps}/odoors/ODRes.h (100%) rename {utils/magiedit => deps}/odoors/ODRes.rc (100%) rename {utils/magiedit => deps}/odoors/ODScrn.c (100%) rename {utils/magiedit => deps}/odoors/ODScrn.h (100%) rename {utils/magiedit => deps}/odoors/ODSpawn.c (100%) rename {utils/magiedit => deps}/odoors/ODStand.c (100%) rename {utils/magiedit => deps}/odoors/ODStat.c (100%) rename {utils/magiedit => deps}/odoors/ODStat.h (100%) rename {utils/magiedit => deps}/odoors/ODStr.c (100%) rename {utils/magiedit => deps}/odoors/ODStr.h (100%) rename {utils/magiedit => deps}/odoors/ODSwap.asm (100%) rename {utils/magiedit => deps}/odoors/ODSwap.h (100%) rename {utils/magiedit => deps}/odoors/ODTypes.h (100%) rename {utils/magiedit => deps}/odoors/ODUtil.c (100%) rename {utils/magiedit => deps}/odoors/ODUtil.h (100%) rename {utils/magiedit => deps}/odoors/ODWCat.c (100%) rename {utils/magiedit => deps}/odoors/ODWin.c (100%) rename {utils/magiedit => deps}/odoors/ODoorW.lib (100%) rename {utils/magiedit => deps}/odoors/OPENDOOR.TXT (100%) rename {utils/magiedit => deps}/odoors/OpenDoor.def (100%) rename {utils/magiedit => deps}/odoors/OpenDoor.h (100%) rename {utils/magiedit => deps}/odoors/README.NIX (100%) rename {utils/magiedit => deps}/odoors/TODO-v7.txt (100%) rename {utils/magiedit => deps}/odoors/Toolbar.bmp (100%) rename {utils/magiedit => deps}/odoors/buildall.bat (100%) rename {utils/magiedit => deps}/odoors/builddos.bat (100%) rename {utils/magiedit => deps}/odoors/ex_chat.c (100%) rename {utils/magiedit => deps}/odoors/ex_diag.c (100%) rename {utils/magiedit => deps}/odoors/ex_hello.c (100%) rename {utils/magiedit => deps}/odoors/ex_music.c (100%) rename {utils/magiedit => deps}/odoors/ex_ski.c (100%) rename {utils/magiedit => deps}/odoors/ex_vote.c (100%) rename {utils/magiedit => deps}/odoors/hbuild.bat (100%) rename {utils/magiedit => deps}/odoors/historic/ODHIST.TXT (100%) rename {utils/magiedit => deps}/odoors/historic/ODN.FRM (100%) rename {utils/magiedit => deps}/odoors/historic/ODN.NFO (100%) rename {utils/magiedit => deps}/odoors/historic/ODTJ9304.TXT (100%) rename {utils/magiedit => deps}/odoors/historic/ODTJ9305.TXT (100%) rename {utils/magiedit => deps}/odoors/historic/ODTJ9402.TXT (100%) rename {utils/magiedit => deps}/odoors/historic/ROLLCALL.TXT (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/BPFIND.H (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/CMDLINE.C (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/CMDLINE.H (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/FILEVIEW.C (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/PAGEVIEW.C (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/PAGEVIEW.H (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/SUMMARY.TXT (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/TIP1.C (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/TIP1.TXT (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/TIP2.C (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/TIP2.TXT (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/TIP3.TXT (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/TIP4.C (100%) rename {utils/magiedit => deps}/odoors/historic/odtips3/TIP4.TXT (100%) rename {utils/magiedit => deps}/odoors/lbuild.bat (100%) rename {utils/magiedit => deps}/odoors/license.txt (100%) rename {utils/magiedit => deps}/odoors/out.txt (100%) rename {utils/magiedit => deps}/odoors/sbuild.bat (100%) rename {utils/magiedit => deps}/odoors/wbuild.bat (100%) rename {utils/magiedit => deps}/odoors/win32.mak (100%) create mode 100644 utils/magiedit/Makefile delete mode 100755 utils/magiedit/build.sh diff --git a/Makefile.freebsd b/Makefile.freebsd index a927c4d..2660d7e 100644 --- a/Makefile.freebsd +++ b/Makefile.freebsd @@ -4,8 +4,9 @@ DEPS = bbs.h JAMLIB = deps/jamlib/jamlib.a ZMODEM = deps/Xmodem/libzmodem.a LUA = deps/lua/liblua.a +ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -all: magicka magimail +all: magicka magimail magiedit ${LUA}: cd deps/lua && $(MAKE) -f Makefile freebsd MAKEFLAGS= @@ -16,6 +17,9 @@ ${JAMLIB}: ${ZMODEM}: cd deps/Xmodem && $(MAKE) MAKEFLAGS= +${ODOORS}: + cd deps/odoors/ && $(MAKE) + OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o %.o: %.c $(DEPS) $(CC) -c -o $@ $< $(CFLAGS) @@ -26,6 +30,9 @@ magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} magimail: $(JAMLIB) cd utils/magimail && $(MAKE) freebsd +magiedit: $(ODOORS) + cd utils/magiedit && $(MAKE) + .PHONY: clean clean: @@ -34,3 +41,5 @@ clean: cd deps/jamlib && $(MAKE) -f Makefile.linux clean cd deps/Xmodem && $(MAKE) clean cd utils/magimail && $(MAKE) cleanfreebsd + cd utils/magiedit && $(MAKE) clean + cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` \ No newline at end of file diff --git a/Makefile.freebsd.WWW b/Makefile.freebsd.WWW index 3831e74..eb3a525 100644 --- a/Makefile.freebsd.WWW +++ b/Makefile.freebsd.WWW @@ -6,8 +6,9 @@ ZMODEM = deps/Xmodem/libzmodem.a LUA = deps/lua/liblua.a B64 = deps/libb64-1.2/src/libb64.a MICROHTTPD=-lmicrohttpd +ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -all: magicka magimail +all: magicka magimail magiedit ${LUA}: cd deps/lua && $(MAKE) -f Makefile freebsd MAKEFLAGS= @@ -21,6 +22,9 @@ ${ZMODEM}: ${B64}: cd deps/libb64-1.2 && $(MAKE) MAKEFLAGS= +${ODOORS}: + cd deps/odoors/ && $(MAKE) + OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o hashmap/hashmap.o %.o: %.c $(DEPS) $(CC) -c -o $@ $< $(CFLAGS) @@ -31,6 +35,9 @@ magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} magimail: $(JAMLIB) cd utils/magimail && $(MAKE) freebsd +magiedit: $(ODOORS) + cd utils/magiedit && $(MAKE) + .PHONY: clean clean: @@ -40,3 +47,5 @@ clean: cd deps/Xmodem && $(MAKE) clean cd deps/libb64-1.2 && $(MAKE) clean cd utils/magimail && $(MAKE) cleanfreebsd + cd utils/magiedit && $(MAKE) clean + cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` \ No newline at end of file diff --git a/Makefile.linux b/Makefile.linux index a96ea59..7083c1c 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -4,9 +4,9 @@ DEPS = bbs.h JAMLIB = deps/jamlib/jamlib.a ZMODEM = deps/Xmodem/libzmodem.a LUA = deps/lua/liblua.a +ODOORS = deps/odoors/libs-`uname -s`/libODoors.a - -all: magicka magimail +all: magicka magimail magiedit ${LUA}: cd deps/lua && $(MAKE) -f Makefile linux MAKEFLAGS= @@ -17,6 +17,9 @@ ${JAMLIB}: ${ZMODEM}: cd deps/Xmodem && $(MAKE) MAKEFLAGS= +${ODOORS}: + cd deps/odoors/ && $(MAKE) + OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o %.o: %.c $(DEPS) $(CC) -c -o $@ $< $(CFLAGS) @@ -27,6 +30,9 @@ magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} magimail: $(JAMLIB) cd utils/magimail && $(MAKE) linux +magiedit: $(ODOORS) + cd utils/magiedit && $(MAKE) + .PHONY: clean clean: @@ -35,3 +41,5 @@ clean: cd deps/jamlib && $(MAKE) -f Makefile.linux clean cd deps/Xmodem && $(MAKE) clean cd utils/magimail && $(MAKE) cleanlinux + cd utils/magiedit && $(MAKE) clean + cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` \ No newline at end of file diff --git a/Makefile.linux.WWW b/Makefile.linux.WWW index 6a42ba2..eb1b912 100644 --- a/Makefile.linux.WWW +++ b/Makefile.linux.WWW @@ -6,8 +6,9 @@ ZMODEM = deps/Xmodem/libzmodem.a LUA = deps/lua/liblua.a B64 = deps/libb64-1.2/src/libb64.a MICROHTTPD=-lmicrohttpd +ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -all: magicka magimail +all: magicka magimail magiedit ${LUA}: cd deps/lua && $(MAKE) -f Makefile linux MAKEFLAGS= @@ -21,6 +22,8 @@ ${ZMODEM}: ${B64}: cd deps/libb64-1.2 && $(MAKE) MAKEFLAGS= +${ODOORS}: + cd deps/odoors/ && $(MAKE) OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o bluewave.o hashmap/hashmap.o %.o: %.c $(DEPS) @@ -32,6 +35,9 @@ magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} ${B64} magimail: $(JAMLIB) cd utils/magimail && $(MAKE) linux +magiedit: $(ODOORS) + cd utils/magiedit && $(MAKE) + .PHONY: clean clean: @@ -41,3 +47,5 @@ clean: cd deps/Xmodem && $(MAKE) clean cd deps/libb64-1.2 && $(MAKE) clean cd utils/magimail && $(MAKE) cleanlinux + cd utils/magiedit && $(MAKE) clean + cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` \ No newline at end of file diff --git a/Makefile.netbsd b/Makefile.netbsd index 103a92f..d5188f3 100644 --- a/Makefile.netbsd +++ b/Makefile.netbsd @@ -4,8 +4,9 @@ DEPS = bbs.h JAMLIB = deps/jamlib/jamlib.a ZMODEM = deps/Xmodem/libzmodem.a LUA = deps/lua/liblua.a +ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -all: magicka +all: magicka magimail magiedit ${LUA}: cd deps/lua && $(MAKE) -f Makefile bsd MAKEFLAGS= @@ -16,6 +17,9 @@ ${JAMLIB}: ${ZMODEM}: cd deps/Xmodem && $(MAKE) MAKEFLAGS= +${ODOORS}: + cd deps/odoors/ && $(MAKE) + OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o %.o: %.c $(DEPS) $(CC) -c -o $@ $< $(CFLAGS) @@ -23,6 +27,12 @@ OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/pkg/lib -lsqlite3 $(JAMLIB) $(ZMODEM) $(LUA) -lutil -lm -lssl -lcrypto -lssh +magiedit: $(ODOORS) + cd utils/magiedit && $(MAKE) + +magimail: $(JAMLIB) + cd utils/magimail && $(MAKE) linux + .PHONY: clean clean: @@ -30,3 +40,7 @@ clean: cd deps/lua && $(MAKE) clean cd deps/jamlib && $(MAKE) -f Makefile.linux clean cd deps/Xmodem && $(MAKE) clean + cd utils/magimail && $(MAKE) cleanlinux + cd utils/magiedit && $(MAKE) clean + cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` + \ No newline at end of file diff --git a/Makefile.netbsd.WWW b/Makefile.netbsd.WWW index 88c5169..1bc3aec 100644 --- a/Makefile.netbsd.WWW +++ b/Makefile.netbsd.WWW @@ -6,8 +6,9 @@ ZMODEM = deps/Xmodem/libzmodem.a LUA = deps/lua/liblua.a B64 = deps/libb64-1.2/src/libb64.a MICROHTTPD=-lmicrohttpd +ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -all: magicka +all: magicka magimail magiedit ${LUA}: cd deps/lua && $(MAKE) -f Makefile bsd MAKEFLAGS= @@ -21,6 +22,9 @@ ${ZMODEM}: ${B64}: cd deps/libb64-1.2 && $(MAKE) MAKEFLAGS= +${ODOORS}: + cd deps/odoors/ && $(MAKE) + OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o hashmap/hashmap.o %.o: %.c $(DEPS) $(CC) -c -o $@ $< $(CFLAGS) @@ -28,6 +32,12 @@ OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/pkg/lib -lsqlite3 $(JAMLIB) $(ZMODEM) $(LUA) $(B64) -lutil -lm -lssl -lcrypto -lssh $(MICROHTTPD) +magiedit: $(ODOORS) + cd utils/magiedit && $(MAKE) + +magimail: $(JAMLIB) + cd utils/magimail && $(MAKE) linux + .PHONY: clean clean: @@ -36,3 +46,6 @@ clean: cd deps/jamlib && $(MAKE) -f Makefile.linux clean cd deps/Xmodem && $(MAKE) clean cd deps/libb64-1.2 && $(MAKE) clean + cd utils/magimail && $(MAKE) cleanlinux + cd utils/magiedit && $(MAKE) clean + cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` \ No newline at end of file diff --git a/Makefile.osx b/Makefile.osx index 68bee62..b350eed 100644 --- a/Makefile.osx +++ b/Makefile.osx @@ -4,10 +4,11 @@ DEPS = bbs.h JAMLIB = deps/jamlib/jamlib.a ZMODEM = deps/Xmodem/libzmodem.a LUA = deps/lua/liblua.a +ODOORS = deps/odoors/libs-`uname -s`/libODoors.a OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o -all: magicka magimail +all: magicka magimail magiedit ${LUA}: cd deps/lua && $(MAKE) -f Makefile macosx MAKEFLAGS= @@ -18,6 +19,9 @@ ${JAMLIB}: ${ZMODEM}: cd deps/Xmodem && $(MAKE) MAKEFLAGS= +${ODOORS}: + cd deps/odoors/ && $(MAKE) + %.o: %.c $(DEPS) $(CC) -c -o $@ $< $(CFLAGS) @@ -27,6 +31,9 @@ magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} magimail: $(JAMLIB) cd utils/magimail && $(MAKE) linux +magiedit: $(ODOORS) + cd utils/magiedit && $(MAKE) + .PHONY: clean clean: @@ -35,3 +42,5 @@ clean: cd deps/jamlib && $(MAKE) -f Makefile.linux clean cd deps/Xmodem && $(MAKE) clean cd utils/magimail && $(MAKE) cleanlinux + cd utils/magiedit && $(MAKE) clean + cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` \ No newline at end of file diff --git a/Makefile.osx.WWW b/Makefile.osx.WWW index eff0b26..0aa2aa8 100644 --- a/Makefile.osx.WWW +++ b/Makefile.osx.WWW @@ -6,9 +6,9 @@ ZMODEM = deps/Xmodem/libzmodem.a LUA = deps/lua/liblua.a B64 = deps/libb64-1.2/src/libb64.a MICROHTTPD=-lmicrohttpd +ODOORS = deps/odoors/libs-`uname -s`/libODoors.a - -all: magicka magimail +all: magicka magimail magiedit ${LUA}: cd deps/lua && $(MAKE) -f Makefile macosx MAKEFLAGS= @@ -22,6 +22,9 @@ ${ZMODEM}: ${B64}: cd deps/libb64-1.2 && $(MAKE) MAKEFLAGS= +${ODOORS}: + cd deps/odoors/ && $(MAKE) + OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o bluewave.o hashmap/hashmap.o %.o: %.c $(DEPS) $(CC) -c -o $@ $< $(CFLAGS) @@ -32,6 +35,9 @@ magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} magimail: $(JAMLIB) cd utils/magimail && $(MAKE) linux +magiedit: $(ODOORS) + cd utils/magiedit && $(MAKE) + .PHONY: clean clean: @@ -40,3 +46,5 @@ clean: cd deps/jamlib && $(MAKE) -f Makefile.linux clean cd deps/Xmodem && $(MAKE) clean cd utils/magimail && $(MAKE) cleanlinux + cd utils/magiedit && $(MAKE) clean + cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` diff --git a/utils/magiedit/odoors/DOOR.CFG b/deps/odoors/DOOR.CFG similarity index 100% rename from utils/magiedit/odoors/DOOR.CFG rename to deps/odoors/DOOR.CFG diff --git a/utils/magiedit/odoors/DORINFO1.DEF b/deps/odoors/DORINFO1.DEF similarity index 100% rename from utils/magiedit/odoors/DORINFO1.DEF rename to deps/odoors/DORINFO1.DEF diff --git a/utils/magiedit/odoors/DOS.mak b/deps/odoors/DOS.mak similarity index 100% rename from utils/magiedit/odoors/DOS.mak rename to deps/odoors/DOS.mak diff --git a/utils/magiedit/odoors/GNUmakefile b/deps/odoors/GNUmakefile similarity index 100% rename from utils/magiedit/odoors/GNUmakefile rename to deps/odoors/GNUmakefile diff --git a/utils/magiedit/odoors/ODApp.ico b/deps/odoors/ODApp.ico similarity index 100% rename from utils/magiedit/odoors/ODApp.ico rename to deps/odoors/ODApp.ico diff --git a/utils/magiedit/odoors/ODAuto.c b/deps/odoors/ODAuto.c similarity index 100% rename from utils/magiedit/odoors/ODAuto.c rename to deps/odoors/ODAuto.c diff --git a/utils/magiedit/odoors/ODBlock.c b/deps/odoors/ODBlock.c similarity index 100% rename from utils/magiedit/odoors/ODBlock.c rename to deps/odoors/ODBlock.c diff --git a/utils/magiedit/odoors/ODCFile.c b/deps/odoors/ODCFile.c similarity index 100% rename from utils/magiedit/odoors/ODCFile.c rename to deps/odoors/ODCFile.c diff --git a/utils/magiedit/odoors/ODCmdLn.c b/deps/odoors/ODCmdLn.c similarity index 100% rename from utils/magiedit/odoors/ODCmdLn.c rename to deps/odoors/ODCmdLn.c diff --git a/utils/magiedit/odoors/ODCom.c b/deps/odoors/ODCom.c similarity index 100% rename from utils/magiedit/odoors/ODCom.c rename to deps/odoors/ODCom.c diff --git a/utils/magiedit/odoors/ODCom.h b/deps/odoors/ODCom.h similarity index 100% rename from utils/magiedit/odoors/ODCom.h rename to deps/odoors/ODCom.h diff --git a/utils/magiedit/odoors/ODCore.c b/deps/odoors/ODCore.c similarity index 100% rename from utils/magiedit/odoors/ODCore.c rename to deps/odoors/ODCore.c diff --git a/utils/magiedit/odoors/ODCore.h b/deps/odoors/ODCore.h similarity index 100% rename from utils/magiedit/odoors/ODCore.h rename to deps/odoors/ODCore.h diff --git a/utils/magiedit/odoors/ODDrBox.c b/deps/odoors/ODDrBox.c similarity index 100% rename from utils/magiedit/odoors/ODDrBox.c rename to deps/odoors/ODDrBox.c diff --git a/utils/magiedit/odoors/ODEdStr.c b/deps/odoors/ODEdStr.c similarity index 100% rename from utils/magiedit/odoors/ODEdStr.c rename to deps/odoors/ODEdStr.c diff --git a/utils/magiedit/odoors/ODEdit.c b/deps/odoors/ODEdit.c similarity index 100% rename from utils/magiedit/odoors/ODEdit.c rename to deps/odoors/ODEdit.c diff --git a/utils/magiedit/odoors/ODEmu.c b/deps/odoors/ODEmu.c similarity index 100% rename from utils/magiedit/odoors/ODEmu.c rename to deps/odoors/ODEmu.c diff --git a/utils/magiedit/odoors/ODFrame.c b/deps/odoors/ODFrame.c similarity index 100% rename from utils/magiedit/odoors/ODFrame.c rename to deps/odoors/ODFrame.c diff --git a/utils/magiedit/odoors/ODFrame.h b/deps/odoors/ODFrame.h similarity index 100% rename from utils/magiedit/odoors/ODFrame.h rename to deps/odoors/ODFrame.h diff --git a/utils/magiedit/odoors/ODGen.h b/deps/odoors/ODGen.h similarity index 100% rename from utils/magiedit/odoors/ODGen.h rename to deps/odoors/ODGen.h diff --git a/utils/magiedit/odoors/ODGetIn.c b/deps/odoors/ODGetIn.c similarity index 100% rename from utils/magiedit/odoors/ODGetIn.c rename to deps/odoors/ODGetIn.c diff --git a/utils/magiedit/odoors/ODGraph.c b/deps/odoors/ODGraph.c similarity index 100% rename from utils/magiedit/odoors/ODGraph.c rename to deps/odoors/ODGraph.c diff --git a/utils/magiedit/odoors/ODInEx.h b/deps/odoors/ODInEx.h similarity index 100% rename from utils/magiedit/odoors/ODInEx.h rename to deps/odoors/ODInEx.h diff --git a/utils/magiedit/odoors/ODInEx1.c b/deps/odoors/ODInEx1.c similarity index 100% rename from utils/magiedit/odoors/ODInEx1.c rename to deps/odoors/ODInEx1.c diff --git a/utils/magiedit/odoors/ODInEx2.c b/deps/odoors/ODInEx2.c similarity index 100% rename from utils/magiedit/odoors/ODInEx2.c rename to deps/odoors/ODInEx2.c diff --git a/utils/magiedit/odoors/ODInQue.c b/deps/odoors/ODInQue.c similarity index 100% rename from utils/magiedit/odoors/ODInQue.c rename to deps/odoors/ODInQue.c diff --git a/utils/magiedit/odoors/ODInQue.h b/deps/odoors/ODInQue.h similarity index 100% rename from utils/magiedit/odoors/ODInQue.h rename to deps/odoors/ODInQue.h diff --git a/utils/magiedit/odoors/ODInfo.ico b/deps/odoors/ODInfo.ico similarity index 100% rename from utils/magiedit/odoors/ODInfo.ico rename to deps/odoors/ODInfo.ico diff --git a/utils/magiedit/odoors/ODKrnl.c b/deps/odoors/ODKrnl.c similarity index 100% rename from utils/magiedit/odoors/ODKrnl.c rename to deps/odoors/ODKrnl.c diff --git a/utils/magiedit/odoors/ODKrnl.h b/deps/odoors/ODKrnl.h similarity index 100% rename from utils/magiedit/odoors/ODKrnl.h rename to deps/odoors/ODKrnl.h diff --git a/utils/magiedit/odoors/ODList.c b/deps/odoors/ODList.c similarity index 100% rename from utils/magiedit/odoors/ODList.c rename to deps/odoors/ODList.c diff --git a/utils/magiedit/odoors/ODLog.c b/deps/odoors/ODLog.c similarity index 100% rename from utils/magiedit/odoors/ODLog.c rename to deps/odoors/ODLog.c diff --git a/utils/magiedit/odoors/ODMulti.c b/deps/odoors/ODMulti.c similarity index 100% rename from utils/magiedit/odoors/ODMulti.c rename to deps/odoors/ODMulti.c diff --git a/utils/magiedit/odoors/ODOORS62.TXT b/deps/odoors/ODOORS62.TXT similarity index 100% rename from utils/magiedit/odoors/ODOORS62.TXT rename to deps/odoors/ODOORS62.TXT diff --git a/utils/magiedit/odoors/ODPCB.c b/deps/odoors/ODPCB.c similarity index 100% rename from utils/magiedit/odoors/ODPCB.c rename to deps/odoors/ODPCB.c diff --git a/utils/magiedit/odoors/ODPlat.c b/deps/odoors/ODPlat.c similarity index 100% rename from utils/magiedit/odoors/ODPlat.c rename to deps/odoors/ODPlat.c diff --git a/utils/magiedit/odoors/ODPlat.h b/deps/odoors/ODPlat.h similarity index 100% rename from utils/magiedit/odoors/ODPlat.h rename to deps/odoors/ODPlat.h diff --git a/utils/magiedit/odoors/ODPopup.c b/deps/odoors/ODPopup.c similarity index 100% rename from utils/magiedit/odoors/ODPopup.c rename to deps/odoors/ODPopup.c diff --git a/utils/magiedit/odoors/ODPrntf.c b/deps/odoors/ODPrntf.c similarity index 100% rename from utils/magiedit/odoors/ODPrntf.c rename to deps/odoors/ODPrntf.c diff --git a/utils/magiedit/odoors/ODRA.c b/deps/odoors/ODRA.c similarity index 100% rename from utils/magiedit/odoors/ODRA.c rename to deps/odoors/ODRA.c diff --git a/utils/magiedit/odoors/ODRes.aps b/deps/odoors/ODRes.aps similarity index 100% rename from utils/magiedit/odoors/ODRes.aps rename to deps/odoors/ODRes.aps diff --git a/utils/magiedit/odoors/ODRes.h b/deps/odoors/ODRes.h similarity index 100% rename from utils/magiedit/odoors/ODRes.h rename to deps/odoors/ODRes.h diff --git a/utils/magiedit/odoors/ODRes.rc b/deps/odoors/ODRes.rc similarity index 100% rename from utils/magiedit/odoors/ODRes.rc rename to deps/odoors/ODRes.rc diff --git a/utils/magiedit/odoors/ODScrn.c b/deps/odoors/ODScrn.c similarity index 100% rename from utils/magiedit/odoors/ODScrn.c rename to deps/odoors/ODScrn.c diff --git a/utils/magiedit/odoors/ODScrn.h b/deps/odoors/ODScrn.h similarity index 100% rename from utils/magiedit/odoors/ODScrn.h rename to deps/odoors/ODScrn.h diff --git a/utils/magiedit/odoors/ODSpawn.c b/deps/odoors/ODSpawn.c similarity index 100% rename from utils/magiedit/odoors/ODSpawn.c rename to deps/odoors/ODSpawn.c diff --git a/utils/magiedit/odoors/ODStand.c b/deps/odoors/ODStand.c similarity index 100% rename from utils/magiedit/odoors/ODStand.c rename to deps/odoors/ODStand.c diff --git a/utils/magiedit/odoors/ODStat.c b/deps/odoors/ODStat.c similarity index 100% rename from utils/magiedit/odoors/ODStat.c rename to deps/odoors/ODStat.c diff --git a/utils/magiedit/odoors/ODStat.h b/deps/odoors/ODStat.h similarity index 100% rename from utils/magiedit/odoors/ODStat.h rename to deps/odoors/ODStat.h diff --git a/utils/magiedit/odoors/ODStr.c b/deps/odoors/ODStr.c similarity index 100% rename from utils/magiedit/odoors/ODStr.c rename to deps/odoors/ODStr.c diff --git a/utils/magiedit/odoors/ODStr.h b/deps/odoors/ODStr.h similarity index 100% rename from utils/magiedit/odoors/ODStr.h rename to deps/odoors/ODStr.h diff --git a/utils/magiedit/odoors/ODSwap.asm b/deps/odoors/ODSwap.asm similarity index 100% rename from utils/magiedit/odoors/ODSwap.asm rename to deps/odoors/ODSwap.asm diff --git a/utils/magiedit/odoors/ODSwap.h b/deps/odoors/ODSwap.h similarity index 100% rename from utils/magiedit/odoors/ODSwap.h rename to deps/odoors/ODSwap.h diff --git a/utils/magiedit/odoors/ODTypes.h b/deps/odoors/ODTypes.h similarity index 100% rename from utils/magiedit/odoors/ODTypes.h rename to deps/odoors/ODTypes.h diff --git a/utils/magiedit/odoors/ODUtil.c b/deps/odoors/ODUtil.c similarity index 100% rename from utils/magiedit/odoors/ODUtil.c rename to deps/odoors/ODUtil.c diff --git a/utils/magiedit/odoors/ODUtil.h b/deps/odoors/ODUtil.h similarity index 100% rename from utils/magiedit/odoors/ODUtil.h rename to deps/odoors/ODUtil.h diff --git a/utils/magiedit/odoors/ODWCat.c b/deps/odoors/ODWCat.c similarity index 100% rename from utils/magiedit/odoors/ODWCat.c rename to deps/odoors/ODWCat.c diff --git a/utils/magiedit/odoors/ODWin.c b/deps/odoors/ODWin.c similarity index 100% rename from utils/magiedit/odoors/ODWin.c rename to deps/odoors/ODWin.c diff --git a/utils/magiedit/odoors/ODoorW.lib b/deps/odoors/ODoorW.lib similarity index 100% rename from utils/magiedit/odoors/ODoorW.lib rename to deps/odoors/ODoorW.lib diff --git a/utils/magiedit/odoors/OPENDOOR.TXT b/deps/odoors/OPENDOOR.TXT similarity index 100% rename from utils/magiedit/odoors/OPENDOOR.TXT rename to deps/odoors/OPENDOOR.TXT diff --git a/utils/magiedit/odoors/OpenDoor.def b/deps/odoors/OpenDoor.def similarity index 100% rename from utils/magiedit/odoors/OpenDoor.def rename to deps/odoors/OpenDoor.def diff --git a/utils/magiedit/odoors/OpenDoor.h b/deps/odoors/OpenDoor.h similarity index 100% rename from utils/magiedit/odoors/OpenDoor.h rename to deps/odoors/OpenDoor.h diff --git a/utils/magiedit/odoors/README.NIX b/deps/odoors/README.NIX similarity index 100% rename from utils/magiedit/odoors/README.NIX rename to deps/odoors/README.NIX diff --git a/utils/magiedit/odoors/TODO-v7.txt b/deps/odoors/TODO-v7.txt similarity index 100% rename from utils/magiedit/odoors/TODO-v7.txt rename to deps/odoors/TODO-v7.txt diff --git a/utils/magiedit/odoors/Toolbar.bmp b/deps/odoors/Toolbar.bmp similarity index 100% rename from utils/magiedit/odoors/Toolbar.bmp rename to deps/odoors/Toolbar.bmp diff --git a/utils/magiedit/odoors/buildall.bat b/deps/odoors/buildall.bat similarity index 100% rename from utils/magiedit/odoors/buildall.bat rename to deps/odoors/buildall.bat diff --git a/utils/magiedit/odoors/builddos.bat b/deps/odoors/builddos.bat similarity index 100% rename from utils/magiedit/odoors/builddos.bat rename to deps/odoors/builddos.bat diff --git a/utils/magiedit/odoors/ex_chat.c b/deps/odoors/ex_chat.c similarity index 100% rename from utils/magiedit/odoors/ex_chat.c rename to deps/odoors/ex_chat.c diff --git a/utils/magiedit/odoors/ex_diag.c b/deps/odoors/ex_diag.c similarity index 100% rename from utils/magiedit/odoors/ex_diag.c rename to deps/odoors/ex_diag.c diff --git a/utils/magiedit/odoors/ex_hello.c b/deps/odoors/ex_hello.c similarity index 100% rename from utils/magiedit/odoors/ex_hello.c rename to deps/odoors/ex_hello.c diff --git a/utils/magiedit/odoors/ex_music.c b/deps/odoors/ex_music.c similarity index 100% rename from utils/magiedit/odoors/ex_music.c rename to deps/odoors/ex_music.c diff --git a/utils/magiedit/odoors/ex_ski.c b/deps/odoors/ex_ski.c similarity index 100% rename from utils/magiedit/odoors/ex_ski.c rename to deps/odoors/ex_ski.c diff --git a/utils/magiedit/odoors/ex_vote.c b/deps/odoors/ex_vote.c similarity index 100% rename from utils/magiedit/odoors/ex_vote.c rename to deps/odoors/ex_vote.c diff --git a/utils/magiedit/odoors/hbuild.bat b/deps/odoors/hbuild.bat similarity index 100% rename from utils/magiedit/odoors/hbuild.bat rename to deps/odoors/hbuild.bat diff --git a/utils/magiedit/odoors/historic/ODHIST.TXT b/deps/odoors/historic/ODHIST.TXT similarity index 100% rename from utils/magiedit/odoors/historic/ODHIST.TXT rename to deps/odoors/historic/ODHIST.TXT diff --git a/utils/magiedit/odoors/historic/ODN.FRM b/deps/odoors/historic/ODN.FRM similarity index 100% rename from utils/magiedit/odoors/historic/ODN.FRM rename to deps/odoors/historic/ODN.FRM diff --git a/utils/magiedit/odoors/historic/ODN.NFO b/deps/odoors/historic/ODN.NFO similarity index 100% rename from utils/magiedit/odoors/historic/ODN.NFO rename to deps/odoors/historic/ODN.NFO diff --git a/utils/magiedit/odoors/historic/ODTJ9304.TXT b/deps/odoors/historic/ODTJ9304.TXT similarity index 100% rename from utils/magiedit/odoors/historic/ODTJ9304.TXT rename to deps/odoors/historic/ODTJ9304.TXT diff --git a/utils/magiedit/odoors/historic/ODTJ9305.TXT b/deps/odoors/historic/ODTJ9305.TXT similarity index 100% rename from utils/magiedit/odoors/historic/ODTJ9305.TXT rename to deps/odoors/historic/ODTJ9305.TXT diff --git a/utils/magiedit/odoors/historic/ODTJ9402.TXT b/deps/odoors/historic/ODTJ9402.TXT similarity index 100% rename from utils/magiedit/odoors/historic/ODTJ9402.TXT rename to deps/odoors/historic/ODTJ9402.TXT diff --git a/utils/magiedit/odoors/historic/ROLLCALL.TXT b/deps/odoors/historic/ROLLCALL.TXT similarity index 100% rename from utils/magiedit/odoors/historic/ROLLCALL.TXT rename to deps/odoors/historic/ROLLCALL.TXT diff --git a/utils/magiedit/odoors/historic/odtips3/BPFIND.H b/deps/odoors/historic/odtips3/BPFIND.H similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/BPFIND.H rename to deps/odoors/historic/odtips3/BPFIND.H diff --git a/utils/magiedit/odoors/historic/odtips3/CMDLINE.C b/deps/odoors/historic/odtips3/CMDLINE.C similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/CMDLINE.C rename to deps/odoors/historic/odtips3/CMDLINE.C diff --git a/utils/magiedit/odoors/historic/odtips3/CMDLINE.H b/deps/odoors/historic/odtips3/CMDLINE.H similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/CMDLINE.H rename to deps/odoors/historic/odtips3/CMDLINE.H diff --git a/utils/magiedit/odoors/historic/odtips3/FILEVIEW.C b/deps/odoors/historic/odtips3/FILEVIEW.C similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/FILEVIEW.C rename to deps/odoors/historic/odtips3/FILEVIEW.C diff --git a/utils/magiedit/odoors/historic/odtips3/PAGEVIEW.C b/deps/odoors/historic/odtips3/PAGEVIEW.C similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/PAGEVIEW.C rename to deps/odoors/historic/odtips3/PAGEVIEW.C diff --git a/utils/magiedit/odoors/historic/odtips3/PAGEVIEW.H b/deps/odoors/historic/odtips3/PAGEVIEW.H similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/PAGEVIEW.H rename to deps/odoors/historic/odtips3/PAGEVIEW.H diff --git a/utils/magiedit/odoors/historic/odtips3/SUMMARY.TXT b/deps/odoors/historic/odtips3/SUMMARY.TXT similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/SUMMARY.TXT rename to deps/odoors/historic/odtips3/SUMMARY.TXT diff --git a/utils/magiedit/odoors/historic/odtips3/TIP1.C b/deps/odoors/historic/odtips3/TIP1.C similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/TIP1.C rename to deps/odoors/historic/odtips3/TIP1.C diff --git a/utils/magiedit/odoors/historic/odtips3/TIP1.TXT b/deps/odoors/historic/odtips3/TIP1.TXT similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/TIP1.TXT rename to deps/odoors/historic/odtips3/TIP1.TXT diff --git a/utils/magiedit/odoors/historic/odtips3/TIP2.C b/deps/odoors/historic/odtips3/TIP2.C similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/TIP2.C rename to deps/odoors/historic/odtips3/TIP2.C diff --git a/utils/magiedit/odoors/historic/odtips3/TIP2.TXT b/deps/odoors/historic/odtips3/TIP2.TXT similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/TIP2.TXT rename to deps/odoors/historic/odtips3/TIP2.TXT diff --git a/utils/magiedit/odoors/historic/odtips3/TIP3.TXT b/deps/odoors/historic/odtips3/TIP3.TXT similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/TIP3.TXT rename to deps/odoors/historic/odtips3/TIP3.TXT diff --git a/utils/magiedit/odoors/historic/odtips3/TIP4.C b/deps/odoors/historic/odtips3/TIP4.C similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/TIP4.C rename to deps/odoors/historic/odtips3/TIP4.C diff --git a/utils/magiedit/odoors/historic/odtips3/TIP4.TXT b/deps/odoors/historic/odtips3/TIP4.TXT similarity index 100% rename from utils/magiedit/odoors/historic/odtips3/TIP4.TXT rename to deps/odoors/historic/odtips3/TIP4.TXT diff --git a/utils/magiedit/odoors/lbuild.bat b/deps/odoors/lbuild.bat similarity index 100% rename from utils/magiedit/odoors/lbuild.bat rename to deps/odoors/lbuild.bat diff --git a/utils/magiedit/odoors/license.txt b/deps/odoors/license.txt similarity index 100% rename from utils/magiedit/odoors/license.txt rename to deps/odoors/license.txt diff --git a/utils/magiedit/odoors/out.txt b/deps/odoors/out.txt similarity index 100% rename from utils/magiedit/odoors/out.txt rename to deps/odoors/out.txt diff --git a/utils/magiedit/odoors/sbuild.bat b/deps/odoors/sbuild.bat similarity index 100% rename from utils/magiedit/odoors/sbuild.bat rename to deps/odoors/sbuild.bat diff --git a/utils/magiedit/odoors/wbuild.bat b/deps/odoors/wbuild.bat similarity index 100% rename from utils/magiedit/odoors/wbuild.bat rename to deps/odoors/wbuild.bat diff --git a/utils/magiedit/odoors/win32.mak b/deps/odoors/win32.mak similarity index 100% rename from utils/magiedit/odoors/win32.mak rename to deps/odoors/win32.mak diff --git a/utils/magiedit/Makefile b/utils/magiedit/Makefile new file mode 100644 index 0000000..26795ca --- /dev/null +++ b/utils/magiedit/Makefile @@ -0,0 +1,22 @@ +CC=cc +CFLAGS=-I../../deps/odoors/ +DEPS = main.c +ODOORS = ../../deps/odoors/libs-`uname -s`/libODoors.a + +OBJ = main.o + +all: magiedit + +${ODOORS}: + cd ../../deps/odoors && $(MAKE) MAKEFLAGS= + +%.o: %.c $(DEPS) + $(CC) -c -o $@ $< $(CFLAGS) + +magiedit: $(OBJ) $(ODOORS) + $(CC) -o magiedit -o $@ $^ $(CFLAGS) $(ODOORS) + +.PHONY: clean + +clean: + rm -f $(OBJ) magiedit diff --git a/utils/magiedit/build.sh b/utils/magiedit/build.sh deleted file mode 100755 index 253b2a3..0000000 --- a/utils/magiedit/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cd odoors -make -cd .. -gcc -I./odoors -c main.c -gcc -o magiedit main.o odoors/libs-`uname`/libODoors.a