Fix compilation with Nim devel

Author: Dennis Felsing

src/nes.nim

@@ -1,5 +1,5 @@
-import nes.types, nes.cpu, nes.apu, nes.ppu, nes.cartridge, nes.controller,
-  nes.mapper, nes.mem
+import nes/types, nes/cpu, nes/apu, nes/ppu, nes/cartridge, nes/controller,
+  nes/mapper, nes/mem
 
 export types.NES, types.NESObj, types.Buttons, setButtons, resolution
 

src/nes/ppu.nim

@@ -121,7 +121,7 @@ proc spritePixel(ppu: var PPU): (uint8, uint8) =
   if not ppu.flagShowSprites:
     return
 
-  for i in 0 .. <ppu.spriteCount:
+  for i in 0 ..< ppu.spriteCount:
     var offset = ppu.cycle - 1 - ppu.spritePositions[i].int
     if offset notin 0..7:
       continue
@@ -215,7 +215,7 @@ proc evaluateSprites(ppu: var PPU) =
     let x = ppu.oamData[i*4+3]
     let row = ppu.scanLine - y.int
 
-    if row notin 0 .. <h:
+    if row notin 0 ..< h:
       continue
 
     if count < 8:

src/nimes.nim

@@ -1,7 +1,7 @@
 import
   rewinder, nes,
   os, times, algorithm,
-  sdl2, sdl2.audio, sdl2.joystick
+  sdl2, sdl2/audio, sdl2/joystick
 
 when defined(emscripten):
   proc emscripten_set_main_loop(fun: proc() {.cdecl.}, fps,
@@ -78,7 +78,7 @@ else:
     title = "NimES"
 
 if not sdl2.init(inits):
-  raise newException(SystemError, "SDL2 initialization failed")
+  raise newException(CatchableError, "SDL2 initialization failed")
 
 discard setHint("SDL_RENDER_SCALE_QUALITY", "0")