Move modules to their own directories

.editorconfig

@@ -11,7 +11,7 @@ tab_width = 4
 charset = utf-8
 trim_trailing_whitespace = true
 
-# The settings for C (*.c and *.h) files are mirrored in src_c/.clang-format.
+# The settings for C (*.c and *.h) files are mirrored in src/.clang-format.
 # Keep them in sync.
 [*.{c,h}]
 max_line_length = 79

.github/workflows/cppcheck.yml

@@ -1,16 +1,16 @@
 name: cppcheck Static Analysis
 
-# Run cppcheck on src_c changes to main branch, or any PR to main.
+# Run cppcheck on src changes to main branch, or any PR to main.
 on:
   push:
     branches: main
     paths:
-      - 'src_c/**'
+      - 'src/**'
 
   pull_request:
     branches: main
     paths:
-      - 'src_c/**'
+      - 'src/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-cppcheck
@@ -34,8 +34,8 @@ jobs:
       - name: Run Static Checker
         # skip cppcheck on SDL_gfx, scrap, scale_mm* and ft_cache for now
         # suppress missingReturn and syntaxError because it gives many false positives
-        run: cppcheck src_c --enable=performance,portability,warning \
-          --suppress=*:src_c/freetype/ft_cache.c --suppress=*:src_c/scrap* \
-          --suppress=*:src_c/scale_mmx*.c --suppress=*:src_c/SDL_gfx/* \
+        run: cppcheck src --enable=performance,portability,warning \
+          --suppress=*:src/freetype/ft_cache.c --suppress=*:src/scrap* \
+          --suppress=*:src/scale_mmx*.c --suppress=*:src/SDL_gfx/* \
           --suppress=missingReturn --suppress=syntaxError -DWITH_THREAD -j $(nproc) \
           -DPG_MAJOR_VERSION -DPG_MINOR_VERSION -DPG_PATCH_VERSION -DPG_VERSION_TAG

.gitignore

@@ -50,7 +50,7 @@ _headers/*
 buildconfig/win_dll_dirs.json
 
 # cython generated files
-src_c/_sdl2/*.c
-!/src_c/_sdl2/touch.c
-!/src_c/_sdl2/controller.c
+src/_sdl2/*.c
+!/src/_sdl2/touch.c
+!/src/_sdl2/controller.c
 src_c/pypm.c

.pre-commit-config.yaml

@@ -40,11 +40,11 @@ repos:
       - id: clang-format
         exclude: |
             (?x)^(
-                ^src_c/_sdl2/.*$
-                | ^src_c/doc/.*$
+                ^src/_sdl2/.*$
+                | ^src/.+/.*_doc.h$
                 | docs/reST/_static/script.js
                 | docs/reST/_templates/header.h
-                | src_c/include/sse2neon.h
-                | src_c/include/pythoncapi_compat.h
-                | src_c/pypm.c
+                | src/include/sse2neon.h
+                | src/include/pythoncapi_compat.h
+                | src/pypm.c
             )$

buildconfig/MANIFEST.in

@@ -1,9 +1,7 @@
 recursive-include buildconfig *
 recursive-include docs *
-recursive-include src_py *
-recursive-include src_c *
+recursive-include src *
 recursive-include examples *
-recursive-include test *
 
 recursive-exclude buildconfig/manylinux-build *
 recursive-exclude buildconfig/macdependencies *

buildconfig/Setup.Android.SDL2.in

@@ -13,54 +13,54 @@ DEBUG =
 #everything you can, but you can ignore ones you don't have
 #dependencies for, just comment them out
 
-imageext src_c/imageext.c $(SDL) $(IMAGE) $(DEBUG)
-font src_c/font.c $(SDL) $(FONT) $(DEBUG)
-mixer src_c/mixer.c $(SDL) $(MIXER) $(DEBUG)
-mixer_music src_c/music.c $(SDL) $(MIXER) $(DEBUG)
-scrap src_c/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-# pypm src_c/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+imageext src/imageext.c $(SDL) $(IMAGE) $(DEBUG)
+font src/font.c $(SDL) $(FONT) $(DEBUG)
+mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
+mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
+scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+# pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
 
-_sdl2.sdl2 src_c/_sdl2/sdl2.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.audio src_c/_sdl2/audio.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.video src_c/_sdl2/video.c src_c/pgcompat.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.mixer src_c/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc_c
-_sdl2.touch src_c/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.controller_old src_c/_sdl2/controller_old.c $(SDL) $(DEBUG) -Isrc_c
+_sdl2.sdl2 src/_sdl2/sdl2.c $(SDL) $(DEBUG) -Isrc
+_sdl2.audio src/_sdl2/audio.c $(SDL) $(DEBUG) -Isrc
+_sdl2.video src/_sdl2/video.c src/pgcompat.c $(SDL) $(DEBUG) -Isrc
+_sdl2.mixer src/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc
+_sdl2.touch src/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc
+_sdl2.controller_old src/_sdl2/controller_old.c $(SDL) $(DEBUG) -Isrc
 
-GFX = src_c/SDL_gfx/SDL_gfxPrimitives.c
-#GFX = src_c/SDL_gfx/SDL_gfxBlitFunc.c src_c/SDL_gfx/SDL_gfxPrimitives.c
-gfxdraw src_c/gfxdraw.c $(SDL) $(GFX) $(DEBUG)
+GFX = src/SDL_gfx/SDL_gfxPrimitives.c
+#GFX = src/SDL_gfx/SDL_gfxBlitFunc.c src/SDL_gfx/SDL_gfxPrimitives.c
+gfxdraw src/gfxdraw.c $(SDL) $(GFX) $(DEBUG)
 
 #optional freetype module (do not break in multiple lines
 #or the configuration script will choke!)
-#_freetype src_c/freetype/ft_cache.c src_c/freetype/ft_wrap.c src_c/freetype/ft_render.c  src_c/freetype/ft_render_cb.c src_c/freetype/ft_layout.c src_c/freetype/ft_unicode.c src_c/_freetype.c $(SDL) $(FREETYPE) $(DEBUG)
+#_freetype src/freetype/ft_cache.c src/freetype/ft_wrap.c src/freetype/ft_render.c  src/freetype/ft_render_cb.c src/freetype/ft_layout.c src/freetype/ft_unicode.c src/_freetype.c $(SDL) $(FREETYPE) $(DEBUG)
 
 
 #these modules are required for pygame to run. they only require
 #SDL as a dependency. these should not be altered
 
-base src_c/base.c $(SDL) $(DEBUG)
-color src_c/color.c $(SDL) $(DEBUG)
-constants src_c/constants.c $(SDL) $(DEBUG)
-display src_c/display.c $(SDL) $(DEBUG)
-event src_c/event.c $(SDL) $(DEBUG)
-key src_c/key.c $(SDL) $(DEBUG)
-mouse src_c/mouse.c $(SDL) $(DEBUG)
-rect src_c/rect.c src_c/pgcompat_rect.c $(SDL) $(DEBUG)
-rwobject src_c/rwobject.c $(SDL) $(DEBUG)
-surface src_c/simd_blitters_sse2.c src_c/simd_blitters_avx2.c src_c/surface.c src_c/alphablit.c src_c/surface_fill.c src_c/simd_surface_fill_avx2.c src_c/simd_surface_fill_sse2.c $(SDL) $(DEBUG)
-surflock src_c/surflock.c $(SDL) $(DEBUG)
-time src_c/time.c $(SDL) $(DEBUG)
-joystick src_c/joystick.c $(SDL) $(DEBUG)
-draw src_c/draw.c $(SDL) $(DEBUG)
-image src_c/image.c $(SDL) $(DEBUG)
-transform src_c/simd_transform_sse2.c src_c/simd_transform_avx2.c src_c/transform.c src_c/rotozoom.c src_c/scale2x.c src_c/scale_mmx.c $(SDL) $(DEBUG) -D_NO_MMX_FOR_X86_64
-mask src_c/mask.c src_c/bitmask.c $(SDL) $(DEBUG)
-bufferproxy src_c/bufferproxy.c $(SDL) $(DEBUG)
-pixelarray src_c/pixelarray.c $(SDL) $(DEBUG)
-math src_c/math.c $(SDL) $(DEBUG)
-pixelcopy src_c/pixelcopy.c $(SDL) $(DEBUG)
-newbuffer src_c/newbuffer.c $(SDL) $(DEBUG)
-window src_c/window.c $(SDL) $(DEBUG)
-_render src_c/render.c $(SDL) $(DEBUG)
-geometry src_c/geometry.c $(SDL) $(DEBUG)
+base src/base.c $(SDL) $(DEBUG)
+color src/color.c $(SDL) $(DEBUG)
+constants src/constants.c $(SDL) $(DEBUG)
+display src/display.c $(SDL) $(DEBUG)
+event src/event.c $(SDL) $(DEBUG)
+key src/key.c $(SDL) $(DEBUG)
+mouse src/mouse.c $(SDL) $(DEBUG)
+rect src/rect.c src/pgcompat_rect.c $(SDL) $(DEBUG)
+rwobject src/rwobject.c $(SDL) $(DEBUG)
+surface src/simd_blitters_sse2.c src/simd_blitters_avx2.c src/surface.c src/alphablit.c src/surface_fill.c src/simd_surface_fill_avx2.c src/simd_surface_fill_sse2.c $(SDL) $(DEBUG)
+surflock src/surflock.c $(SDL) $(DEBUG)
+time src/time.c $(SDL) $(DEBUG)
+joystick src/joystick.c $(SDL) $(DEBUG)
+draw src/draw/draw.c $(SDL) $(DEBUG)
+image src/image.c $(SDL) $(DEBUG)
+transform src/simd_transform_sse2.c src/simd_transform_avx2.c src/transform.c src/rotozoom.c src/scale2x.c src/scale_mmx.c $(SDL) $(DEBUG) -D_NO_MMX_FOR_X86_64
+mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
+bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
+pixelarray src/pixelarray.c $(SDL) $(DEBUG)
+math src/math.c $(SDL) $(DEBUG)
+pixelcopy src/pixelcopy.c $(SDL) $(DEBUG)
+newbuffer src/newbuffer.c $(SDL) $(DEBUG)
+window src/window.c $(SDL) $(DEBUG)
+_render src/render.c $(SDL) $(DEBUG)
+geometry src/geometry.c $(SDL) $(DEBUG)

buildconfig/Setup.Emscripten.SDL2.in

@@ -15,64 +15,64 @@ DEBUG =
 
 # these can build alone and object files merged with ar
 
-_sdl2.sdl2 src_c/_sdl2/sdl2.c $(SDL) $(DEBUG) -Isrc_c
+_sdl2.sdl2 src/_sdl2/sdl2.c $(SDL) $(DEBUG) -Isrc
 
-_sdl2.audio src_c/_sdl2/audio.c $(SDL) $(DEBUG) -Isrc_c
+_sdl2.audio src/_sdl2/audio.c $(SDL) $(DEBUG) -Isrc
 
-pygame_sdl2_video src_c/_sdl2/video.c src_c/pgcompat.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.video = src_c/void.c
+pygame_sdl2_video src/_sdl2/video.c src/pgcompat.c $(SDL) $(DEBUG) -Isrc
+_sdl2.video = src/static/void.c
 
 
-_sdl2.mixer src_c/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc_c
+_sdl2.mixer src/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc
 
-constants src_c/constants.c $(SDL) $(DEBUG)
-mask src_c/bitmask.c
-math src_c/math.c $(SDL) $(DEBUG)
+constants src/constants.c $(SDL) $(DEBUG)
+mask src/bitmask.c
+math src/math.c $(SDL) $(DEBUG)
 
-#GFX = src_c/SDL_gfx/SDL_gfxBlitFunc.c src_c/SDL_gfx/SDL_gfxPrimitives.c
-GFX = src_c/SDL_gfx/SDL_gfxPrimitives.c
+#GFX = src/SDL_gfx/SDL_gfxBlitFunc.c src/SDL_gfx/SDL_gfxPrimitives.c
+GFX = src/SDL_gfx/SDL_gfxPrimitives.c
 
 
-static src_c/static.c $(SDL) $(FREETYPE) $(FONT) $(MIXER) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
+static src/static/static.c $(SDL) $(FREETYPE) $(FONT) $(MIXER) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
 
 # these should not be altered they already are in static.c merging file above
-time src_c/void.c
-_freetype src_c/void.c
-imageext src_c/void.c
-image src_c/void.c
-base src_c/void.c
-bufferproxy src_c/void.c
-color src_c/void.c
-controller src_c/void.c
-controller_old src_c/void.c
-display src_c/void.c
-draw src_c/void.c
-event src_c/void.c
-font src_c/void.c
-gfxdraw  src_c/void.c
-joystick src_c/void.c
-key src_c/void.c
-newbuffer  src_c/void.c
-mixer_music src_c/void.c
-mixer src_c/void.c
-mouse src_c/void.c
-pixelcopy src_c/void.c
-pixelarray src_c/void.c
-surface src_c/void.c
-surflock src_c/void.c
-rect src_c/void.c
-rwobject src_c/void.c
-system src_c/void.c
-window src_c/void.c
-_render src_c/void.c
-geometry src_c/void.c
-
-#_sdl2.controller src_c/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.controller src_c/void.c
-_sdl2.controller_old src_c/void.c
-
-#_sdl2.touch src_c/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.touch src_c/void.c
-
-#transform src_c/simd_transform_sse2.c src_c/simd_transform_avx2.c src_c/transform.c src_c/rotozoom.c src_c/scale2x.c src_c/scale_mmx.c src_c/simd_surface_fill_avx2.c src_c/simd_surface_fill_sse2.c $(SDL) $(DEBUG) -D_NO_MMX_FOR_X86_64
-transform src_c/void.c
+time src/static/void.c
+_freetype src/static/void.c
+imageext src/static/void.c
+image src/static/void.c
+base src/static/void.c
+bufferproxy src/static/void.c
+color src/static/void.c
+controller src/static/void.c
+controller_old src/static/void.c
+display src/static/void.c
+draw src/static/void.c
+event src/static/void.c
+font src/static/void.c
+gfxdraw  src/static/void.c
+joystick src/static/void.c
+key src/static/void.c
+newbuffer src/static/void.c
+mixer_music src/static/void.c
+mixer src/static/void.c
+mouse src/static/void.c
+pixelcopy src/static/void.c
+pixelarray src/static/void.c
+surface src/static/void.c
+surflock src/static/void.c
+rect src/static/void.c
+rwobject src/static/void.c
+system src/static/void.c
+window src/static/void.c
+_render src/static/void.c
+geometry src/static/void.c
+
+#_sdl2.controller src/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc
+_sdl2.controller src/static/void.c
+_sdl2.controller_old src/static/void.c
+
+#_sdl2.touch src/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc
+_sdl2.touch src/static/void.c
+
+#transform src/simd_transform_sse2.c src/simd_transform_avx2.c src/transform.c src/rotozoom.c src/scale2x.c src/scale_mmx.c src/simd_surface_fill_avx2.c src/simd_surface_fill_sse2.c $(SDL) $(DEBUG) -D_NO_MMX_FOR_X86_64
+transform src/static/void.c

buildconfig/Setup.SDL2.in

@@ -23,56 +23,56 @@ DEBUG =
 #everything you can, but you can ignore ones you don't have
 #dependencies for, just comment them out
 
-imageext src_c/imageext.c $(SDL) $(IMAGE) $(DEBUG)
-font src_c/font.c $(SDL) $(FONT) $(DEBUG)
-mixer src_c/mixer.c $(SDL) $(MIXER) $(DEBUG)
-mixer_music src_c/music.c $(SDL) $(MIXER) $(DEBUG)
-scrap src_c/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-pypm src_c/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+imageext src/imageext.c $(SDL) $(IMAGE) $(DEBUG)
+font src/font.c $(SDL) $(FONT) $(DEBUG)
+mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
+mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
+scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
 
-_sdl2.sdl2 src_c/_sdl2/sdl2.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.audio src_c/_sdl2/audio.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.video src_c/_sdl2/video.c src_c/pgcompat.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.mixer src_c/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc_c
-_sdl2.touch src_c/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.controller src_c/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.controller_old src_c/_sdl2/controller_old.c $(SDL) $(DEBUG) -Isrc_c
+_sdl2.sdl2 src/_sdl2/sdl2.c $(SDL) $(DEBUG) -Isrc
+_sdl2.audio src/_sdl2/audio.c $(SDL) $(DEBUG) -Isrc
+_sdl2.video src/_sdl2/video.c src/pgcompat.c $(SDL) $(DEBUG) -Isrc
+_sdl2.mixer src/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc
+_sdl2.touch src/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc
+_sdl2.controller src/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc
+_sdl2.controller_old src/_sdl2/controller_old.c $(SDL) $(DEBUG) -Isrc
 
-GFX = src_c/SDL_gfx/SDL_gfxPrimitives.c
-#GFX = src_c/SDL_gfx/SDL_gfxBlitFunc.c src_c/SDL_gfx/SDL_gfxPrimitives.c
-gfxdraw src_c/gfxdraw.c $(SDL) $(GFX) $(DEBUG)
+GFX = src/SDL_gfx/SDL_gfxPrimitives.c
+#GFX = src/SDL_gfx/SDL_gfxBlitFunc.c src/SDL_gfx/SDL_gfxPrimitives.c
+gfxdraw src/gfxdraw.c $(SDL) $(GFX) $(DEBUG)
 
 #optional freetype module (do not break in multiple lines
 #or the configuration script will choke!)
-_freetype src_c/freetype/ft_cache.c src_c/freetype/ft_wrap.c src_c/freetype/ft_render.c  src_c/freetype/ft_render_cb.c src_c/freetype/ft_layout.c src_c/freetype/ft_unicode.c src_c/_freetype.c $(SDL) $(FREETYPE) $(DEBUG)
+_freetype src/freetype/ft_cache.c src/freetype/ft_wrap.c src/freetype/ft_render.c  src/freetype/ft_render_cb.c src/freetype/ft_layout.c src/freetype/ft_unicode.c src/_freetype.c $(SDL) $(FREETYPE) $(DEBUG)
 
 
 #these modules are required for pygame to run. they only require
 #SDL as a dependency. these should not be altered
 
-base src_c/base.c $(SDL) $(DEBUG)
-color src_c/color.c $(SDL) $(DEBUG)
-constants src_c/constants.c $(SDL) $(DEBUG)
-display src_c/display.c $(SDL) $(DEBUG)
-event src_c/event.c $(SDL) $(DEBUG)
-key src_c/key.c $(SDL) $(DEBUG)
-mouse src_c/mouse.c $(SDL) $(DEBUG)
-rect src_c/rect.c src_c/pgcompat_rect.c $(SDL) $(DEBUG)
-rwobject src_c/rwobject.c $(SDL) $(DEBUG)
-surface src_c/simd_blitters_sse2.c src_c/simd_blitters_avx2.c src_c/surface.c src_c/alphablit.c src_c/surface_fill.c src_c/simd_surface_fill_avx2.c src_c/simd_surface_fill_sse2.c $(SDL) $(DEBUG)
-surflock src_c/surflock.c $(SDL) $(DEBUG)
-time src_c/time.c $(SDL) $(DEBUG)
-joystick src_c/joystick.c $(SDL) $(DEBUG)
-draw src_c/draw.c $(SDL) $(DEBUG)
-image src_c/image.c $(SDL) $(DEBUG)
-transform src_c/simd_transform_sse2.c src_c/simd_transform_avx2.c src_c/transform.c src_c/rotozoom.c src_c/scale2x.c src_c/scale_mmx.c $(SDL) $(DEBUG)
-mask src_c/mask.c src_c/bitmask.c $(SDL) $(DEBUG)
-bufferproxy src_c/bufferproxy.c $(SDL) $(DEBUG)
-pixelarray src_c/pixelarray.c $(SDL) $(DEBUG)
-math src_c/math.c $(SDL) $(DEBUG)
-pixelcopy src_c/pixelcopy.c $(SDL) $(DEBUG)
-newbuffer src_c/newbuffer.c $(SDL) $(DEBUG)
-system src_c/system.c $(SDL) $(DEBUG)
-geometry src_c/geometry.c $(SDL) $(DEBUG)
-window src_c/window.c $(SDL) $(DEBUG)
-_render src_c/render.c $(SDL) $(DEBUG)
+base src/base.c $(SDL) $(DEBUG)
+color src/color.c $(SDL) $(DEBUG)
+constants src/constants.c $(SDL) $(DEBUG)
+display src/display.c $(SDL) $(DEBUG)
+event src/event.c $(SDL) $(DEBUG)
+key src/key.c $(SDL) $(DEBUG)
+mouse src/mouse.c $(SDL) $(DEBUG)
+rect src/rect.c src/pgcompat_rect.c $(SDL) $(DEBUG)
+rwobject src/rwobject.c $(SDL) $(DEBUG)
+surface src/simd_blitters_sse2.c src/simd_blitters_avx2.c src/surface.c src/alphablit.c src/surface_fill.c src/simd_surface_fill_avx2.c src/simd_surface_fill_sse2.c $(SDL) $(DEBUG)
+surflock src/surflock.c $(SDL) $(DEBUG)
+time src/time.c $(SDL) $(DEBUG)
+joystick src/joystick.c $(SDL) $(DEBUG)
+draw src/draw/draw.c $(SDL) $(DEBUG)
+image src/image.c $(SDL) $(DEBUG)
+transform src/simd_transform_sse2.c src/simd_transform_avx2.c src/transform.c src/rotozoom.c src/scale2x.c src/scale_mmx.c $(SDL) $(DEBUG)
+mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
+bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
+pixelarray src/pixelarray.c $(SDL) $(DEBUG)
+math src/math.c $(SDL) $(DEBUG)
+pixelcopy src/pixelcopy.c $(SDL) $(DEBUG)
+newbuffer src/newbuffer.c $(SDL) $(DEBUG)
+system src/system.c $(SDL) $(DEBUG)
+geometry src/geometry.c $(SDL) $(DEBUG)
+window src/window.c $(SDL) $(DEBUG)
+_render src/render.c $(SDL) $(DEBUG)

buildconfig/Setup_Darwin.in

@@ -1,4 +1,4 @@
 #This file defines platform specific modules for mac os x
 SCRAP =
-scrap src_c/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-_camera src_c/_camera.c $(SDL) $(DEBUG)
+scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+_camera src/_camera.c $(SDL) $(DEBUG)