reorganize NES C++ code

Kautenja · Jan 9, 2019 · 1abddd9 · 1abddd9
1 parent 9fffbee
commit 1abddd9
Show file tree

Hide file tree

Showing 33 changed files with 38 additions and 4 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-graft nes_py/cpp
+graft nes_py/nes
diff --git a/makefile b/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

diff --git a/nes_py/nes/SConstruct b/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)
diff --git a/nes_py/cpp/include/cartridge.hpp → nes_py/nes/include/cartridge.hpp b/nes_py/cpp/include/cartridge.hpp → nes_py/nes/include/cartridge.hpp
diff --git a/nes_py/cpp/include/common.hpp → nes_py/nes/include/common.hpp b/nes_py/cpp/include/common.hpp → nes_py/nes/include/common.hpp
diff --git a/nes_py/cpp/include/controller.hpp → nes_py/nes/include/controller.hpp b/nes_py/cpp/include/controller.hpp → nes_py/nes/include/controller.hpp
diff --git a/nes_py/cpp/include/cpu.hpp → nes_py/nes/include/cpu.hpp b/nes_py/cpp/include/cpu.hpp → nes_py/nes/include/cpu.hpp
diff --git a/nes_py/cpp/include/cpu_opcodes.hpp → nes_py/nes/include/cpu_opcodes.hpp b/nes_py/cpp/include/cpu_opcodes.hpp → nes_py/nes/include/cpu_opcodes.hpp
diff --git a/nes_py/cpp/include/emulator.hpp → nes_py/nes/include/emulator.hpp b/nes_py/cpp/include/emulator.hpp → nes_py/nes/include/emulator.hpp
diff --git a/nes_py/cpp/include/log.hpp → nes_py/nes/include/log.hpp b/nes_py/cpp/include/log.hpp → nes_py/nes/include/log.hpp
diff --git a/nes_py/cpp/include/main_bus.hpp → nes_py/nes/include/main_bus.hpp b/nes_py/cpp/include/main_bus.hpp → nes_py/nes/include/main_bus.hpp
diff --git a/nes_py/cpp/include/mapper.hpp → nes_py/nes/include/mapper.hpp b/nes_py/cpp/include/mapper.hpp → nes_py/nes/include/mapper.hpp
diff --git a/nes_py/cpp/include/mappers/mapper_CNROM.hpp → nes_py/nes/include/mappers/mapper_CNROM.hpp b/nes_py/cpp/include/mappers/mapper_CNROM.hpp → nes_py/nes/include/mappers/mapper_CNROM.hpp
diff --git a/nes_py/cpp/include/mappers/mapper_NROM.hpp → nes_py/nes/include/mappers/mapper_NROM.hpp b/nes_py/cpp/include/mappers/mapper_NROM.hpp → nes_py/nes/include/mappers/mapper_NROM.hpp
diff --git a/nes_py/cpp/include/mappers/mapper_SxROM.hpp → nes_py/nes/include/mappers/mapper_SxROM.hpp b/nes_py/cpp/include/mappers/mapper_SxROM.hpp → nes_py/nes/include/mappers/mapper_SxROM.hpp
diff --git a/nes_py/cpp/include/mappers/mapper_UxROM.hpp → nes_py/nes/include/mappers/mapper_UxROM.hpp b/nes_py/cpp/include/mappers/mapper_UxROM.hpp → nes_py/nes/include/mappers/mapper_UxROM.hpp
diff --git a/nes_py/cpp/include/palette.hpp → nes_py/nes/include/palette.hpp b/nes_py/cpp/include/palette.hpp → nes_py/nes/include/palette.hpp
diff --git a/nes_py/cpp/include/picture_bus.hpp → nes_py/nes/include/picture_bus.hpp b/nes_py/cpp/include/picture_bus.hpp → nes_py/nes/include/picture_bus.hpp
diff --git a/nes_py/cpp/include/ppu.hpp → nes_py/nes/include/ppu.hpp b/nes_py/cpp/include/ppu.hpp → nes_py/nes/include/ppu.hpp
diff --git a/nes_py/cpp/cartridge.cpp → nes_py/nes/src/cartridge.cpp b/nes_py/cpp/cartridge.cpp → nes_py/nes/src/cartridge.cpp
diff --git a/nes_py/cpp/controller.cpp → nes_py/nes/src/controller.cpp b/nes_py/cpp/controller.cpp → nes_py/nes/src/controller.cpp
diff --git a/nes_py/cpp/cpu.cpp → nes_py/nes/src/cpu.cpp b/nes_py/cpp/cpu.cpp → nes_py/nes/src/cpu.cpp
diff --git a/nes_py/cpp/emulator.cpp → nes_py/nes/src/emulator.cpp b/nes_py/cpp/emulator.cpp → nes_py/nes/src/emulator.cpp
diff --git a/nes_py/cpp/lib_nes_env.cpp → nes_py/nes/src/lib_nes_env.cpp b/nes_py/cpp/lib_nes_env.cpp → nes_py/nes/src/lib_nes_env.cpp
diff --git a/nes_py/cpp/main_bus.cpp → nes_py/nes/src/main_bus.cpp b/nes_py/cpp/main_bus.cpp → nes_py/nes/src/main_bus.cpp
diff --git a/nes_py/cpp/mapper.cpp → nes_py/nes/src/mapper.cpp b/nes_py/cpp/mapper.cpp → nes_py/nes/src/mapper.cpp
diff --git a/nes_py/cpp/mappers/mapper_CNROM.cpp → nes_py/nes/src/mappers/mapper_CNROM.cpp b/nes_py/cpp/mappers/mapper_CNROM.cpp → nes_py/nes/src/mappers/mapper_CNROM.cpp
diff --git a/nes_py/cpp/mappers/mapper_NROM.cpp → nes_py/nes/src/mappers/mapper_NROM.cpp b/nes_py/cpp/mappers/mapper_NROM.cpp → nes_py/nes/src/mappers/mapper_NROM.cpp
diff --git a/nes_py/cpp/mappers/mapper_SxROM.cpp → nes_py/nes/src/mappers/mapper_SxROM.cpp b/nes_py/cpp/mappers/mapper_SxROM.cpp → nes_py/nes/src/mappers/mapper_SxROM.cpp
diff --git a/nes_py/cpp/mappers/mapper_UxROM.cpp → nes_py/nes/src/mappers/mapper_UxROM.cpp b/nes_py/cpp/mappers/mapper_UxROM.cpp → nes_py/nes/src/mappers/mapper_UxROM.cpp
diff --git a/nes_py/cpp/picture_bus.cpp → nes_py/nes/src/picture_bus.cpp b/nes_py/cpp/picture_bus.cpp → nes_py/nes/src/picture_bus.cpp
diff --git a/nes_py/cpp/ppu.cpp → nes_py/nes/src/ppu.cpp b/nes_py/cpp/ppu.cpp → nes_py/nes/src/ppu.cpp
diff --git a/setup.py b/setup.py
@@ -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',