Enable Linux compilable support

.gitignore

@@ -12,4 +12,5 @@ Debug/
 v16/
 FileContentIndex/
 v17/
+*.o
 

makefile

@@ -1,142 +1,238 @@
 all: atanua
 
-atanua-cpp-src = \
-fileio.cpp \
-BoxStitchingInformation.cpp \
-and8chip.cpp \
-or8chip.cpp \
-nand8chip.cpp \
-nor8chip.cpp \
-slidingaverage.cpp \
-switchchip.cpp \
-16segchip.cpp \
-ledgrid.cpp \
-box.cpp \
-extpin.cpp \
-chip7489.cpp \
-audiochip.cpp \
-7segchip.cpp \
-and3chip.cpp \
-andchip.cpp \
-angelcodefont.cpp \
-atanuaconfig.cpp \
-basechipfactory.cpp \
-buttonchip.cpp \
-stepper.cpp \
-chip309.cpp \
-chip27xx.cpp \
-chip74193.cpp \
-chip74165.cpp \
-chip74192.cpp \
-chip.cpp \
-chip2051.cpp \
-chip7400.cpp \
-chip7402.cpp \
-chip7404.cpp \
-chip7408.cpp \
-chip7410.cpp \
-chip74138.cpp \
-chip74139.cpp \
-chip74151.cpp \
-chip74154.cpp \
-chip74163.cpp \
-chip74164.cpp \
-chip74181.cpp \
-chip74191.cpp \
-chip74195.cpp \
-chip7420.cpp \
-chip74240.cpp \
-chip74241.cpp \
-chip74244.cpp \
-chip74245.cpp \
-chip74283.cpp \
-chip7432.cpp \
-chip7447.cpp \
-chip74574.cpp \
-chip7473.cpp \
-chip7474.cpp \
-chip7485.cpp \
-chip7486.cpp \
-chip7490.cpp \
-clockchip.cpp \
-dchip.cpp \
-dflipflop.cpp \
-dxchip.cpp \
-extrapin.cpp \
-fileutils.cpp \
-jkchip.cpp \
-jkflipflop.cpp \
-label.cpp \
-ledchip.cpp \
-logicprobe.cpp \
-main.cpp \
-mersennetwister.cpp \
-muxchip.cpp \
-nand3chip.cpp \
-nandchip.cpp \
-nativefunctions.cpp \
-net.cpp \
-nor3chip.cpp \
-norchip.cpp \
-notchip.cpp \
-or3chip.cpp \
-orchip.cpp \
-pin.cpp \
-pluginchip.cpp \
-pluginchipfactory.cpp \
-sedchip.cpp \
-serchip.cpp \
-simutils.cpp \
-srchip.cpp \
-srflipflop.cpp \
-srnegchip.cpp \
-staticlevelchip.cpp \
-tchip.cpp \
-tflipflop.cpp \
-toolkit.cpp \
-wire.cpp \
-xorchip.cpp \
-tinyxml/tinystr.cpp \
-tinyxml/tinyxml.cpp \
-tinyxml/tinyxmlerror.cpp \
-tinyxml/tinyxmlparser.cpp \
-
+# Copied from atanua.vcxproj
+glee-c-src = \
+    src/glee/GLee.c
 
 atanua-c-src = \
-8051/core.c \
-8051/disasm.c \
-8051/opcodes.c \
-stb/stb_image.c \
-stb/stb_image_write.c \
-glee/GLee.c
+    src/8051/core.c \
+    src/8051/disasm.c \
+    src/8051/opcodes.c \
+    src/stb/stb_image.c \
+    src/stb/stb_image_write.c
+
+atanua-basecode-cpp-src = \
+    src/basecode/angelcodefont.cpp \
+    src/basecode/mersennetwister.cpp \
+    src/basecode/toolkit.cpp \
+    #
+
+atanua-core-cpp-src = \
+    src/core/AtanuaConfig.cpp \
+    src/core/basechipfactory.cpp \
+    src/core/BoxStitchingInformation.cpp \
+    src/core/chip.cpp \
+    src/core/fileio.cpp \
+    src/core/fileutils.cpp \
+    src/core/main.cpp \
+    src/core/nativefunctions.cpp \
+    src/core/net.cpp \
+    src/core/pin.cpp \
+    src/core/pluginchip.cpp \
+    src/core/pluginchipfactory.cpp \
+    src/core/simutils.cpp \
+    src/core/slidingaverage.cpp \
+    src/core/texture.cpp \
+    src/core/wire.cpp \
+    #
+
+atanua-chips-cpp-src = \
+    src/chip/16segchip.cpp \
+    src/chip/7segchip.cpp \
+    src/chip/and3chip.cpp \
+    src/chip/and8chip.cpp \
+    src/chip/andchip.cpp \
+    src/chip/audiochip.cpp \
+    src/chip/box.cpp \
+    src/chip/buttonchip.cpp \
+    src/chip/chip2051.cpp \
+    src/chip/chip27xx.cpp \
+    src/chip/chip309.cpp \
+    src/chip/chip6116.cpp \
+    src/chip/chip7400.cpp \
+    src/chip/chip7402.cpp \
+    src/chip/chip7404.cpp \
+    src/chip/chip7408.cpp \
+    src/chip/chip7410.cpp \
+    src/chip/chip74138.cpp \
+    src/chip/chip74139.cpp \
+    src/chip/chip74151.cpp \
+    src/chip/chip74154.cpp \
+    src/chip/chip74163.cpp \
+    src/chip/chip74164.cpp \
+    src/chip/chip74165.cpp \
+    src/chip/chip74181.cpp \
+    src/chip/chip74191.cpp \
+    src/chip/chip74192.cpp \
+    src/chip/chip74193.cpp \
+    src/chip/chip74195.cpp \
+    src/chip/chip7420.cpp \
+    src/chip/chip74240.cpp \
+    src/chip/chip74241.cpp \
+    src/chip/chip74244.cpp \
+    src/chip/chip74245.cpp \
+    src/chip/chip74283.cpp \
+    src/chip/chip74299.cpp \
+    src/chip/chip7432.cpp \
+    src/chip/chip744040.cpp \
+    src/chip/chip7447.cpp \
+    src/chip/chip74574.cpp \
+    src/chip/chip7473.cpp \
+    src/chip/chip7474.cpp \
+    src/chip/chip7485.cpp \
+    src/chip/chip7486.cpp \
+    src/chip/chip7489.cpp \
+    src/chip/chip7490.cpp \
+    src/chip/clockchip.cpp \
+    src/chip/composite.cpp \
+    src/chip/dchip.cpp \
+    src/chip/dflipflop.cpp \
+    src/chip/dxchip.cpp \
+    src/chip/extpin.cpp \
+    src/chip/extrapin.cpp \
+    src/chip/jkchip.cpp \
+    src/chip/jkflipflop.cpp \
+    src/chip/label.cpp \
+    src/chip/ledchip.cpp \
+    src/chip/ledgrid.cpp \
+    src/chip/logicprobe.cpp \
+    src/chip/muxchip.cpp \
+    src/chip/namedpin.cpp \
+    src/chip/nand3chip.cpp \
+    src/chip/nand8chip.cpp \
+    src/chip/nandchip.cpp \
+    src/chip/nor3chip.cpp \
+    src/chip/nor8chip.cpp \
+    src/chip/norchip.cpp \
+    src/chip/notchip.cpp \
+    src/chip/or3chip.cpp \
+    src/chip/or8chip.cpp \
+    src/chip/orchip.cpp \
+    src/chip/pullhighchip.cpp \
+    src/chip/pulllowchip.cpp \
+    src/chip/sedchip.cpp \
+    src/chip/serchip.cpp \
+    src/chip/srchip.cpp \
+    src/chip/srflipflop.cpp \
+    src/chip/srnegchip.cpp \
+    src/chip/staticlevelchip.cpp \
+    src/chip/stepper.cpp \
+    src/chip/switchchip.cpp \
+    src/chip/tchip.cpp \
+    src/chip/tflipflop.cpp \
+    src/chip/TriStateChip.cpp \
+    src/chip/xorchip.cpp \
+    #
+
+tinyxml-src = \
+    src/tinyxml_2_5_3/tinyxml/tinystr.cpp \
+    src/tinyxml_2_5_3/tinyxml/tinyxml.cpp \
+    src/tinyxml_2_5_3/tinyxml/tinyxmlerror.cpp \
+    src/tinyxml_2_5_3/tinyxml/tinyxmlparser.cpp \
+    #
+
+atanua-headers = \
+    Header.h \
+    src/include/16segchip.h \
+    src/include/7segchip.h \
+    src/include/and3chip.h \
+    src/include/and8chip.h \
+    src/include/andchip.h \
+    src/include/angelcodefont.h \
+    src/include/atanua.h \
+    src/include/atanua_internal.h \
+    src/include/audiochip.h \
+    src/include/basechipfactory.h \
+    src/include/box.h \
+    src/include/buttonchip.h \
+    src/include/chip2051.h \
+    src/include/chip27xx.h \
+    src/include/chip309.h \
+    src/include/chip6116.h \
+    src/include/chip7400.h \
+    src/include/chip7402.h \
+    src/include/chip7404.h \
+    src/include/chip7408.h \
+    src/include/chip7410.h \
+    src/include/chip74138.h \
+    src/include/chip74139.h \
+    src/include/chip74151.h \
+    src/include/chip74154.h \
+    src/include/chip74163.h \
+    src/include/chip74164.h \
+    src/include/chip74165.h \
+    src/include/chip74181.h \
+    src/include/chip74191.h \
+    src/include/chip74192.h \
+    src/include/chip74193.h \
+    src/include/chip74195.h \
+    src/include/chip7420.h \
+    src/include/chip74240.h \
+    src/include/chip74241.h \
+    src/include/chip74244.h \
+    src/include/chip74245.h \
+    src/include/chip74283.h \
+    src/include/chip74299.h \
+    src/include/chip7432.h \
+    src/include/chip744040.h \
+    src/include/chip7447.h \
+    src/include/chip74574.h \
+    src/include/chip7473.h \
+    src/include/chip7474.h \
+    src/include/chip7485.h \
+    src/include/chip7486.h \
+    src/include/chip7489.h \
+    #
+
+tinyxml-src = # use system library instead
+atanua-cpp-src = $(atanua-basecode-cpp-src) $(atanua-core-cpp-src) $(atanua-chips-cpp-src) $(tinyxml-src)
 
+glee-obj = $(glee-c-src:.c=.o)
 atanua-obj = $(atanua-cpp-src:.cpp=.o) $(atanua-c-src:.c=.o)
 
-CXX = clang
+CXX = clang++
 CC = clang
 
+# more recent tinyxml does not work
+TINYXML_CFLAGS = `pkg-config --cflags tinyxml`
+TINYXML_LIBS = `pkg-config --libs tinyxml`
+#TINYXML_CFLAGS = -Isrc/tinyxml_2_5_3/tinyxml
+#TINYXML_LIBS = # bundled source
+
+SDL2_CFLAGS  = `pkg-config --cflags sdl2`
+SDL2_LIBS    = `pkg-config --libs sdl2`
+GTK_CFLAGS   = `pkg-config --cflags gtk+-3.0`
+GTK_LIBS     = `pkg-config --libs gtk+-3.0`
+GLIB2_CFLAGS = `pkg-config --cflags glib-2.0`
+GLIB2_LIBS   = `pkg-config --libs glib-2.0`
+GLEW_CFLAGS  = `pkg-config --cflags glew`
+GLEW_LIBS    = `pkg-config --libs glew`
+
+LIBS = \
+       $(TINYXML_LIBS) \
+       $(SDL2_LIBS) \
+       $(GTK_LIBS) \
+       $(GLIB2_LIBS) \
+       $(GLEW_LIBS)
+
+CPPFLAGS = \
+     $(TINYXML_CFLAGS) \
+     $(SDL2_CFLAGS) \
+     $(GTK_CFLAGS) \
+     $(GLIB2_CFLAGS) \
+     $(GLEW_CFLAGS)
+
 CXXFLAGS = \
 -O3 \
--I/usr/include/c++/4.5 \
--I/usr/include/c++/4.5/i686-linux-gnu \
--I/usr/X11R6/include \
--Itinyxml \
--I/usr/include/gtk-3.0 \
--I/usr/include/cairo \
--I/usr/include/glib-2.0 \
--I/usr/lib/glib-2.0/include \
--I/usr/include/pango-1.0 \
--I/usr/lib/gtk-3.0/include \
--I/usr/include/atk-1.0 \
--I/usr/lib/i386-linux-gnu/glib-2.0/include \
--I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
--I/usr/include/gdk-pixbuf-2.0 
-
-
-
-atanua: $(atanua-obj)
-	$(CXX) `pkg-config --cflags gtk+-3.0` `pkg-config --cflags glib-2.0` -o $@ $(atanua-obj) -L. -lSDLmain -lSDL -lGL -lGLU `pkg-config --libs gtk+-3.0` `pkg-config --libs glib-2.0` -O3 $(CXXFLAGS)
+-Isrc \
+-Isrc/include \
+$(CPPFLAGS)
+#
+
+
+atanua: $(atanua-obj) $(glee-obj) $(atanua-headers)
+	$(CXX) $(CXXFLAGS) -o $@ $(atanua-obj) -L. $(LIBS)
 
 clean:
-	rm $(atanua-obj) atanua
+	rm -f $(atanua-obj) $(glee-obj) atanua
 

src/8051/core.c

@@ -441,7 +441,7 @@ int tick(struct em8051 *aCPU)
 
 int decode(struct em8051 *aCPU, int aPosition, unsigned char *aBuffer)
 {
-    return aCPU->dec[aCPU->mCodeMem[aPosition & (aCPU->mCodeMemSize - 1)]](aCPU, aPosition, aBuffer);
+    return aCPU->dec[aCPU->mCodeMem[aPosition & (aCPU->mCodeMemSize - 1)]](aCPU, aPosition, (char *)aBuffer);
 }
 
 void disasm_setptrs(struct em8051 *aCPU);

src/basecode/angelcodefont.cpp

@@ -22,9 +22,14 @@ distribution.
 */
 #include <stdio.h>
 #include <stdlib.h>
-#include "atanua.h"
 #include "toolkit.h"
+#include "atanua.h"
 #include "fileutils.h"
+#include "texture.h"
+
+#if !defined(GLEW_ARB_vertex_buffer_object) && defined (GL_ARB_vertex_buffer_object)
+#define GLEW_ARB_vertex_buffer_object GL_ARB_vertex_buffer_object
+#endif
 
 void ACFontInfoBlock::load(File * f)
 {