reorganize NES C++ code

Author: Kautenja

MANIFEST.in

@@ -1 +1 @@
-graft nes_py/cpp
+graft nes_py/nes

makefile

@@ -11,7 +11,8 @@ all: test deployment
 
 # build the LaiNES CPP code
 lib_nes_env:
-	scons
+	cd nes_py/nes && scons
+	mv nes_py/nes/lib_nes_env*.so nes_py
 
 # run the Python test suite
 test: lib_nes_env
@@ -28,6 +29,7 @@ clean:
 	rm nes_py/lib_nes_env.so || true
 	find . -name "*.pyc" -delete
 	find . -name "__pycache__" -delete
+	find . -name ".sconsign.dblite" -delete
 
 # build the deployment package
 deployment: clean

nes_py/nes/SConstruct

@@ -0,0 +1,32 @@
+"""The compilation script for this project using SCons."""
+from os import environ
+
+
+# create a separate build directory
+VariantDir('build', 'src', duplicate=0)
+
+
+#  the compiler and linker flags for the C++ environment
+FLAGS = [
+    '-std=c++1y',
+    '-O2',
+    '-march=native',
+    '-pipe',
+]
+
+
+# Create the C++ environment
+ENV = Environment(
+    ENV=environ,
+    CXX='clang++',
+    CPPFLAGS=['-Wno-unused-value'],
+    CXXFLAGS=FLAGS,
+    LINKFLAGS=FLAGS,
+    CPPPATH=['#include'],
+)
+
+
+# Locate all the C++ source files
+SRC = Glob('build/*.cpp') + Glob('build/*/*.cpp')
+# Create a shared library (it will add "lib" to the front automatically)
+ENV.SharedLibrary('_nes_env.so', SRC)

nes_py/cpp/include/cartridge.hpp nes_py/nes/include/cartridge.hpp

@@ -14,11 +14,11 @@
 # The source files for building the extension. Globs locate all the cpp files
 # used by the LaiNES subproject. MANIFEST.in has to include the blanket
 # "cpp" directory to ensure that the .inc file gets included too
-SOURCES = glob('nes_py/cpp/*.cpp') + glob('nes_py/cpp/mappers/*.cpp')
+SOURCES = glob('nes_py/nes/src/*.cpp') + glob('nes_py/nes/src/mappers/*.cpp')
 # The directory pointing to header files used by the LaiNES cpp files.
 # This directory has to be included using MANIFEST.in too to include the
 # headers with sdist
-INCLUDE_DIRS = ['nes_py/cpp/include']
+INCLUDE_DIRS = ['nes_py/nes/include']
 # Build arguments to pass to the compiler
 EXTRA_COMPILE_ARGS = [
     '-std=c++1y',