Update build process and instructions

Author: ComputerNerd

INSTALL

@@ -1,11 +1,21 @@
 If you are a windows user and want to build this you will need mingw.
-First of all in the Retro Graphics Toolkit directory create a folder called lua
-Then extract all files from the src folder into the folder you just created.
-Then rename all *.c files to *.cpp
-HINT: Don't do this manually on *unix you can just run:
-rename .c .cpp *.c
-The reason lua is built even though many distributions already provide lua is so that the latest version is used and so that this version which may be built with a different configuration does not overwrite your system's instillation of lua.
-(Windows only on other systems your distribution of choice should already have provided fltk) you will now need to build fltk to do this download fltk-1.3.2 and extract it into the Retro Graphics Toolkit project folder and build it using
+
+First of all in the Retro Graphics Toolkit directory create a folder called lua or luawin on windows.
+Note the only reason for creating a separate folder is to accommodate for the fact that I do all my development on GNU/Linux and have a separate instillation of GCC as a cross compiler. This allows me to quickly test the windows build and *unix build simultaneously.
+Extract the latest version of Lua in the newly created folder.
+Now edit the makefile in src
+edit CC=gcc to say CC=g++
+If you are using a cross compiler make sure to take into account it's prefix also you will need to modify the AR and RANLIB variables if such is the case.
+Also if you are building on windows you must replace this line in the Makefile
+	"AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
+with
+	"AR=$(CC) -shared -static-libgcc -static-libstdc++ -o" "RANLIB=strip --strip-all" \
+Lua can be build using c++ which is what we are doing this is to take advantage of GCC's support for zero cost exception handling using throw.
+The reason Lua is built even though many distributions already provide Lua is so that the latest version is used and so that this version which may be built with a different configuration does not overwrite your system's instillation of Lua.
+Now run make linux or make mingw depending on your system platform.
+DO NOT RUN MAKE INSTALL.
+
+(Windows only. On other systems your distribution of choice should already have provided fltk) you will now need to build fltk to do this download fltk-1.3.2 and extract it into the Retro Graphics Toolkit project folder and build it using
 either ./configure if you are on windows or if you are cross compiling you need to something like this ./configure --host=i686-pc-mingw32 --build=x86_64-unknown-linux-gnu
 Regardless of how ./configure is ran you will just need to run make and you are done building fltk.
 

callback_gui.cpp

@@ -19,7 +19,7 @@
 #include "color_convert.h"
 #include "system.h"
 #include "callback_project.h"
-#include "lua/lua.h"
+#include "lua.h"
 static const char* GPLv3="This program is free software: you can redistribute it and/or modify\n"
 	"it under the terms of the GNU General Public License as published by\n"
 	"the Free Software Foundation, either version 3 of the License, or\n"

make_debug

@@ -1,23 +1,22 @@
-CPPFLAGS=-MD -MP -DLUA_USE_LINUX -DLUA_COMPAT_ALL
+CPPFLAGS=-MD -MP
 CC=gcc
 CXX=g++
 #gentoo fix needs include directory set to /usr/include/fltk-1 if you are using a different distro then this may not apply to you
-CFLAGS=-I/usr/include/fltk-1/ -Ikens/ -c -Wall -O0 -ggdb 
+CFLAGS=-I/usr/include/fltk-1/ -Ilua/src -Ikens/ -c -Wall -O0 -ggdb 
 CXXFLAGS= $(CFLAGS) -std=gnu++11
-LDFLAGS=-L/usr/lib/fltk-1/ -lfltk_images -lfltk -lpng -ljpeg -lXft -lXext -lXinerama -lX11 -lz -ldl -lreadline
-LUAOBJECTS=lua/lapi.o lua/lcode.o lua/lctype.o lua/ldebug.o lua/ldo.o lua/ldump.o lua/lfunc.o lua/lgc.o lua/llex.o lua/lmem.o lua/lobject.o lua/lopcodes.o lua/lparser.o lua/lstate.o lua/lstring.o lua/ltable.o lua/ltm.o lua/lundump.o lua/lvm.o lua/lzio.o lua/lauxlib.o lua/lbaselib.o lua/lbitlib.o lua/lcorolib.o lua/ldblib.o lua/liolib.o lua/lmathlib.o lua/loslib.o lua/lstrlib.o lua/ltablib.o lua/loadlib.o lua/linit.o
-OBJECTS=$(LUAOBJECTS) project.o main.o callbacks_palette.o callback_tiles.o class_global.o global.o quant.o tilemap.o color_convert.o \
+OBJECTS=project.o main.o callbacks_palette.o callback_tiles.o class_global.o global.o quant.o tilemap.o color_convert.o \
 	errorMsg.o class_palette.o dither.o \
 	class_tiles.o kens/nemesis.o kens/enigma.o kens/kosinski.o spatial_color_quant.o NEUQUANT.o \
 	classtilemap.o palette.o zlibwrapper.o color_compare.o windowinit.o tiles_io.o savepng.o \
 	callback_project.o callback_tilemap.o callback_gui.o classChunks.o compressionWrapper.o callback_chunk.o gui.o \
 	wu.o system.o filemisc.o classSprite.o classSprites.o callbacksprites.o undo.o undocallback.o image.o \
 	classlevel.o runlua.o
 EXECUTABLE=RetroGraphicsToolkit
+LINKER=-L/usr/lib/fltk-1/ -lfltk_images -lfltk -lpng -ljpeg -lXft -lXext -lXinerama -lX11 -lz -Llua/src -llua -ldl
 all: $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)
-	$(CXX) $(OBJECTS) $(LDFLAGS) -o $@
+	$(CXX) $(OBJECTS) $(LINKER) -o $@
 .c.o:
 	$(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@
 .cc.o:

make_win

@@ -1,22 +1,21 @@
-CPPFLAGS=-DLUA_COMPAT_ALL
+CPPFLAGS=
 CC=i686-pc-mingw32-gcc
 CXX=i686-pc-mingw32-g++
 STRIP=i686-pc-mingw32-strip
 #to compile on windows you must compile fltk
 #I compiled fltk in a folder named fltk-1.3.2 which is in the Retro Graphics tookit directory
 #if that is not the case for you edit the makefile changing paths
-CFLAGS=-Ifltk-1.3.2/ -Ikens/ -Ifltk-1.3.2/zlib -I fltk-1.3.2/png -c -Wall -O2 -s -ffunction-sections -fdata-sections -mwindows -fomit-frame-pointer -pipe -Wl,--gc-sections
+CFLAGS=-Ifltk-1.3.2/ -Ikens/ -Ifltk-1.3.2/zlib -I fltk-1.3.2/png -Iluawin/src -c -Wall -O2 -s -ffunction-sections -fdata-sections -mwindows -fomit-frame-pointer -pipe -Wl,--gc-sections
 CXXFLAGS=$(CFLAGS) -std=gnu++11 -fno-rtti -std=gnu++11
 LDFLAGS= -O2 -s -fomit-frame-pointer -Wl,--as-needed -Wl,--gc-sections
-LUAOBJECTS=lua/lapi.o lua/lcode.o lua/lctype.o lua/ldebug.o lua/ldo.o lua/ldump.o lua/lfunc.o lua/lgc.o lua/llex.o lua/lmem.o lua/lobject.o lua/lopcodes.o lua/lparser.o lua/lstate.o lua/lstring.o lua/ltable.o lua/ltm.o lua/lundump.o lua/lvm.o lua/lzio.o lua/lauxlib.o lua/lbaselib.o lua/lbitlib.o lua/lcorolib.o lua/ldblib.o lua/liolib.o lua/lmathlib.o lua/loslib.o lua/lstrlib.o lua/ltablib.o lua/loadlib.o lua/linit.o
-OBJECTS=$(LUAOBJECTS) project.o main.o callbacks_palette.o callback_tiles.o class_global.o global.o quant.o tilemap.o color_convert.o \
+OBJECTS= project.o main.o callbacks_palette.o callback_tiles.o class_global.o global.o quant.o tilemap.o color_convert.o \
 	errorMsg.o class_palette.o dither.o \
 	class_tiles.o kens/nemesis.o kens/enigma.o kens/kosinski.o spatial_color_quant.o NEUQUANT.o \
 	classtilemap.o palette.o zlibwrapper.o color_compare.o windowinit.o tiles_io.o savepng.o \
 	callback_project.o callback_tilemap.o callback_gui.o classChunks.o compressionWrapper.o callback_chunk.o gui.o \
 	wu.o system.o filemisc.o classSprite.o classSprites.o callbacksprites.o undo.o undocallback.o image.o \
 	classlevel.o runlua.o
-LINKER=-Lfltk-1.3.2/lib -s -static-libgcc -static-libstdc++ -lfltk_images -lfltk -lfltk_jpeg -lfltk_png -lfltk_z -mwindows -lole32 -luuid -lcomctl32
+LINKER=-Lfltk-1.3.2/lib -s -static-libgcc -static-libstdc++ -lfltk_images -lfltk -lfltk_jpeg -lfltk_png -lfltk_z -mwindows -lole32 -luuid -lcomctl32 -Lluawin/src -llua52
 EXECUTABLE=RetroGraphicsToolkit.exe
 
 all: $(EXECUTABLE)

makefile

@@ -1,24 +1,25 @@
-CPPFLAGS=-DLUA_USE_LINUX -DLUA_COMPAT_ALL
+CPPFLAGS=
 CC=gcc
 CPP=g++
 #gentoo fix needs include directory set to /usr/include/fltk-1 if you are using a different distro then this may not apply to you
-CFLAGS=-march=native -flto -fuse-linker-plugin -I/usr/include/fltk-1/ -s -Ikens/ -c -Wall -Wextra -Wdouble-promotion -O3 -pipe -march=native -fomit-frame-pointer
+CFLAGS=-march=native -flto -fuse-linker-plugin -I/usr/include/fltk-1/ -Ilua/src -s -Ikens/ -c -Wall -Wextra -Wdouble-promotion -O3 -pipe -march=native -fomit-frame-pointer
 CXXFLAGS= $(CFLAGS) -fno-rtti -std=gnu++11
 LDFLAGS=-flto -O3 -march=native -fuse-linker-plugin -s -fno-rtti -std=gnu++11 -L/usr/lib/fltk-1/ -lfltk_images -lfltk -lpng -ljpeg -lXft -lXext -lXinerama -lX11 -lz -s
-LUAOBJECTS=lua/lapi.o lua/lcode.o lua/lctype.o lua/ldebug.o lua/ldo.o lua/ldump.o lua/lfunc.o lua/lgc.o lua/llex.o lua/lmem.o lua/lobject.o lua/lopcodes.o lua/lparser.o lua/lstate.o lua/lstring.o lua/ltable.o lua/ltm.o lua/lundump.o lua/lvm.o lua/lzio.o lua/lauxlib.o lua/lbaselib.o lua/lbitlib.o lua/lcorolib.o lua/ldblib.o lua/liolib.o lua/lmathlib.o lua/loslib.o lua/lstrlib.o lua/ltablib.o lua/loadlib.o lua/linit.o
-OBJECTS=$(LUAOBJECTS) project.o main.o callbacks_palette.o callback_tiles.o class_global.o global.o quant.o tilemap.o color_convert.o \
+OBJECTS= project.o main.o callbacks_palette.o callback_tiles.o class_global.o global.o quant.o tilemap.o color_convert.o \
 	errorMsg.o class_palette.o dither.o \
 	class_tiles.o kens/nemesis.o kens/enigma.o kens/kosinski.o spatial_color_quant.o NEUQUANT.o \
 	classtilemap.o palette.o zlibwrapper.o color_compare.o windowinit.o tiles_io.o savepng.o \
 	callback_project.o callback_tilemap.o callback_gui.o classChunks.o compressionWrapper.o callback_chunk.o gui.o \
 	wu.o system.o filemisc.o classSprite.o classSprites.o callbacksprites.o undo.o undocallback.o image.o \
 	classlevel.o runlua.o
+LINKER=-L/usr/lib/fltk-1/ -lfltk_images -lfltk -lpng -ljpeg -lXft -lXext -lXinerama -lX11 -lz -Llua/src -llua -ldl
+
 EXECUTABLE=RetroGraphicsToolkit
 
 all: $(SOURCES) $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)
-	$(CXX) $(OBJECTS) $(LDFLAGS) -o $@
+	$(CXX) $(OBJECTS) $(LINKER) -o $@
 .c.o:
 	$(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@
 .cc.o:

runlua.cpp

@@ -17,9 +17,9 @@
 #include <string>
 #include "includes.h"
 #include "gui.h"
-#include "lua/lua.h"
-#include "lua/lualib.h"
-#include "lua/lauxlib.h"
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
 static int panic(lua_State *L){
 	fl_alert("PANIC: unprotected error in call to Lua API (%s)\n",lua_tostring(L, -1));
 	throw 0;//Otherwise abort() would be called when not needed
@@ -38,18 +38,14 @@ void runLua(Fl_Widget*,void*){
 		lua_State *L = lua_newstate(l_alloc, NULL);
   		if(L){
 			lua_atpanic(L, &panic);
-			luaL_openlibs(L);
 			try{
+				luaL_openlibs(L);
 				int s = luaL_loadfile(L, scriptname.c_str());
-				if(s){
-					if (s != LUA_OK && !lua_isnil(L, -1)) {
-						const char *msg = lua_tostring(L, -1);
-						if (msg == NULL) msg = "(error object is not a string)";
-						fl_alert(msg);
-						lua_pop(L, 1);
-						/* force a complete garbage collection in case of errors */
-						lua_gc(L, LUA_GCCOLLECT, 0);
-					}
+				if(s != LUA_OK && !lua_isnil(L, -1)){
+					const char *msg = lua_tostring(L, -1);
+					if (msg == NULL) msg = "(error object is not a string)";
+					fl_alert(msg);
+					lua_pop(L, 1);
 				}else{
 					// execute Lua program
 					s = lua_pcall(L, 0, LUA_MULTRET, 0);