diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index 60c743096..44a593170 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -11,6 +11,7 @@ SUBDIRS = . $(UI_DIR)
 endif
 DIST_SUBDIRS = . gdbstub cli cocoa gtk gtk-glade windows
 noinst_LIBRARIES = libdesmume.a
+INCLUDES = -I@top_srcdir@/src/agg/include
 libdesmume_a_SOURCES = \
         armcpu.cpp armcpu.h ARM9.h \
         arm_instructions.cpp arm_instructions.h \
@@ -48,6 +49,12 @@ libdesmume_a_SOURCES = \
 	utils/decrypt/decrypt.h utils/decrypt/header.cpp utils/decrypt/header.h \
 	addons.cpp addons.h \
 	addons/compactFlash.cpp addons/gbagame.cpp addons/none.cpp addons/rumblepak.cpp addons/guitarGrip.cpp fs.h \
+	agg/src/agg_arc.cpp agg/src/agg_arrowhead.cpp agg/src/agg_bezier_arc.cpp agg/src/agg_bspline.cpp agg/src/agg_curves.cpp \
+	agg/src/agg_embedded_raster_fonts.cpp agg/src/agg_gsv_text.cpp agg/src/agg_image_filters.cpp agg/src/agg_line_aa_basics.cpp agg/src/agg_line_profile_aa.cpp \
+	agg/src/agg_rounded_rect.cpp agg/src/agg_sqrt_tables.cpp \
+	agg/src/agg_trans_affine.cpp agg/src/agg_trans_double_path.cpp agg/src/agg_trans_single_path.cpp agg/src/agg_trans_warp_magnifier.cpp \
+	agg/src/agg_vcgen_bspline.cpp agg/src/agg_vcgen_contour.cpp agg/src/agg_vcgen_dash.cpp agg/src/agg_vcgen_markers_term.cpp agg/src/agg_vcgen_smooth_poly1.cpp agg/src/agg_vcgen_stroke.cpp \
+	agg/src/agg_vpgen_clip_polygon.cpp agg/src/agg_vpgen_clip_polyline.cpp agg/src/agg_vpgen_segmentator \
 	mic.cpp mic.h \
 	cheatSystem.cpp cheatSystem.h \
 	texcache.cpp texcache.h rasterize.cpp rasterize.h \
diff --git a/desmume/src/windows/agg/agg-2.5.lib b/desmume/src/agg/agg-2.5.lib
similarity index 100%
rename from desmume/src/windows/agg/agg-2.5.lib
rename to desmume/src/agg/agg-2.5.lib
diff --git a/desmume/src/windows/agg/agg-2.5.sln b/desmume/src/agg/agg-2.5.sln
similarity index 100%
rename from desmume/src/windows/agg/agg-2.5.sln
rename to desmume/src/agg/agg-2.5.sln
diff --git a/desmume/src/windows/agg/agg-2.5.vcproj b/desmume/src/agg/agg-2.5.vcproj
similarity index 94%
rename from desmume/src/windows/agg/agg-2.5.vcproj
rename to desmume/src/agg/agg-2.5.vcproj
index a7b53ac89..44e0ad147 100644
--- a/desmume/src/windows/agg/agg-2.5.vcproj
+++ b/desmume/src/agg/agg-2.5.vcproj
@@ -6,7 +6,6 @@
 	ProjectGUID="{887D5BD9-14EB-4B81-AABA-71E1E1063044}"
 	RootNamespace="agg-2.5"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -80,7 +79,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="."
+			OutputDirectory="..\windows\agg"
 			IntermediateDirectory="Release"
 			ConfigurationType="4"
 			WholeProgramOptimization="0"
diff --git a/desmume/src/windows/agg/examples/pixel_formats.h b/desmume/src/agg/examples/pixel_formats.h
similarity index 100%
rename from desmume/src/windows/agg/examples/pixel_formats.h
rename to desmume/src/agg/examples/pixel_formats.h
diff --git a/desmume/src/windows/agg/font_freetype/agg_font_freetype.cpp b/desmume/src/agg/font_freetype/agg_font_freetype.cpp
similarity index 100%
rename from desmume/src/windows/agg/font_freetype/agg_font_freetype.cpp
rename to desmume/src/agg/font_freetype/agg_font_freetype.cpp
diff --git a/desmume/src/windows/agg/font_freetype/agg_font_freetype.h b/desmume/src/agg/font_freetype/agg_font_freetype.h
similarity index 100%
rename from desmume/src/windows/agg/font_freetype/agg_font_freetype.h
rename to desmume/src/agg/font_freetype/agg_font_freetype.h
diff --git a/desmume/src/windows/agg/font_win32_tt/agg_font_win32_tt.cpp b/desmume/src/agg/font_win32_tt/agg_font_win32_tt.cpp
similarity index 100%
rename from desmume/src/windows/agg/font_win32_tt/agg_font_win32_tt.cpp
rename to desmume/src/agg/font_win32_tt/agg_font_win32_tt.cpp
diff --git a/desmume/src/windows/agg/font_win32_tt/agg_font_win32_tt.h b/desmume/src/agg/font_win32_tt/agg_font_win32_tt.h
similarity index 100%
rename from desmume/src/windows/agg/font_win32_tt/agg_font_win32_tt.h
rename to desmume/src/agg/font_win32_tt/agg_font_win32_tt.h
diff --git a/desmume/src/windows/agg/include/agg_alpha_mask_u8.h b/desmume/src/agg/include/agg_alpha_mask_u8.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_alpha_mask_u8.h
rename to desmume/src/agg/include/agg_alpha_mask_u8.h
diff --git a/desmume/src/windows/agg/include/agg_arc.h b/desmume/src/agg/include/agg_arc.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_arc.h
rename to desmume/src/agg/include/agg_arc.h
diff --git a/desmume/src/windows/agg/include/agg_array.h b/desmume/src/agg/include/agg_array.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_array.h
rename to desmume/src/agg/include/agg_array.h
diff --git a/desmume/src/windows/agg/include/agg_arrowhead.h b/desmume/src/agg/include/agg_arrowhead.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_arrowhead.h
rename to desmume/src/agg/include/agg_arrowhead.h
diff --git a/desmume/src/windows/agg/include/agg_basics.h b/desmume/src/agg/include/agg_basics.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_basics.h
rename to desmume/src/agg/include/agg_basics.h
diff --git a/desmume/src/windows/agg/include/agg_bezier_arc.h b/desmume/src/agg/include/agg_bezier_arc.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_bezier_arc.h
rename to desmume/src/agg/include/agg_bezier_arc.h
diff --git a/desmume/src/windows/agg/include/agg_bitset_iterator.h b/desmume/src/agg/include/agg_bitset_iterator.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_bitset_iterator.h
rename to desmume/src/agg/include/agg_bitset_iterator.h
diff --git a/desmume/src/windows/agg/include/agg_blur.h b/desmume/src/agg/include/agg_blur.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_blur.h
rename to desmume/src/agg/include/agg_blur.h
diff --git a/desmume/src/windows/agg/include/agg_bounding_rect.h b/desmume/src/agg/include/agg_bounding_rect.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_bounding_rect.h
rename to desmume/src/agg/include/agg_bounding_rect.h
diff --git a/desmume/src/windows/agg/include/agg_bspline.h b/desmume/src/agg/include/agg_bspline.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_bspline.h
rename to desmume/src/agg/include/agg_bspline.h
diff --git a/desmume/src/windows/agg/include/agg_clip_liang_barsky.h b/desmume/src/agg/include/agg_clip_liang_barsky.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_clip_liang_barsky.h
rename to desmume/src/agg/include/agg_clip_liang_barsky.h
diff --git a/desmume/src/windows/agg/include/agg_color_gray.h b/desmume/src/agg/include/agg_color_gray.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_color_gray.h
rename to desmume/src/agg/include/agg_color_gray.h
diff --git a/desmume/src/windows/agg/include/agg_color_rgba.h b/desmume/src/agg/include/agg_color_rgba.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_color_rgba.h
rename to desmume/src/agg/include/agg_color_rgba.h
diff --git a/desmume/src/windows/agg/include/agg_config.h b/desmume/src/agg/include/agg_config.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_config.h
rename to desmume/src/agg/include/agg_config.h
diff --git a/desmume/src/windows/agg/include/agg_conv_adaptor_vcgen.h b/desmume/src/agg/include/agg_conv_adaptor_vcgen.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_adaptor_vcgen.h
rename to desmume/src/agg/include/agg_conv_adaptor_vcgen.h
diff --git a/desmume/src/windows/agg/include/agg_conv_adaptor_vpgen.h b/desmume/src/agg/include/agg_conv_adaptor_vpgen.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_adaptor_vpgen.h
rename to desmume/src/agg/include/agg_conv_adaptor_vpgen.h
diff --git a/desmume/src/windows/agg/include/agg_conv_bspline.h b/desmume/src/agg/include/agg_conv_bspline.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_bspline.h
rename to desmume/src/agg/include/agg_conv_bspline.h
diff --git a/desmume/src/windows/agg/include/agg_conv_clip_polygon.h b/desmume/src/agg/include/agg_conv_clip_polygon.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_clip_polygon.h
rename to desmume/src/agg/include/agg_conv_clip_polygon.h
diff --git a/desmume/src/windows/agg/include/agg_conv_clip_polyline.h b/desmume/src/agg/include/agg_conv_clip_polyline.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_clip_polyline.h
rename to desmume/src/agg/include/agg_conv_clip_polyline.h
diff --git a/desmume/src/windows/agg/include/agg_conv_close_polygon.h b/desmume/src/agg/include/agg_conv_close_polygon.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_close_polygon.h
rename to desmume/src/agg/include/agg_conv_close_polygon.h
diff --git a/desmume/src/windows/agg/include/agg_conv_concat.h b/desmume/src/agg/include/agg_conv_concat.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_concat.h
rename to desmume/src/agg/include/agg_conv_concat.h
diff --git a/desmume/src/windows/agg/include/agg_conv_contour.h b/desmume/src/agg/include/agg_conv_contour.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_contour.h
rename to desmume/src/agg/include/agg_conv_contour.h
diff --git a/desmume/src/windows/agg/include/agg_conv_curve.h b/desmume/src/agg/include/agg_conv_curve.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_curve.h
rename to desmume/src/agg/include/agg_conv_curve.h
diff --git a/desmume/src/windows/agg/include/agg_conv_dash.h b/desmume/src/agg/include/agg_conv_dash.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_dash.h
rename to desmume/src/agg/include/agg_conv_dash.h
diff --git a/desmume/src/windows/agg/include/agg_conv_gpc.h b/desmume/src/agg/include/agg_conv_gpc.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_gpc.h
rename to desmume/src/agg/include/agg_conv_gpc.h
diff --git a/desmume/src/windows/agg/include/agg_conv_marker.h b/desmume/src/agg/include/agg_conv_marker.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_marker.h
rename to desmume/src/agg/include/agg_conv_marker.h
diff --git a/desmume/src/windows/agg/include/agg_conv_marker_adaptor.h b/desmume/src/agg/include/agg_conv_marker_adaptor.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_marker_adaptor.h
rename to desmume/src/agg/include/agg_conv_marker_adaptor.h
diff --git a/desmume/src/windows/agg/include/agg_conv_segmentator.h b/desmume/src/agg/include/agg_conv_segmentator.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_segmentator.h
rename to desmume/src/agg/include/agg_conv_segmentator.h
diff --git a/desmume/src/windows/agg/include/agg_conv_shorten_path.h b/desmume/src/agg/include/agg_conv_shorten_path.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_shorten_path.h
rename to desmume/src/agg/include/agg_conv_shorten_path.h
diff --git a/desmume/src/windows/agg/include/agg_conv_smooth_poly1.h b/desmume/src/agg/include/agg_conv_smooth_poly1.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_smooth_poly1.h
rename to desmume/src/agg/include/agg_conv_smooth_poly1.h
diff --git a/desmume/src/windows/agg/include/agg_conv_stroke.h b/desmume/src/agg/include/agg_conv_stroke.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_stroke.h
rename to desmume/src/agg/include/agg_conv_stroke.h
diff --git a/desmume/src/windows/agg/include/agg_conv_transform.h b/desmume/src/agg/include/agg_conv_transform.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_transform.h
rename to desmume/src/agg/include/agg_conv_transform.h
diff --git a/desmume/src/windows/agg/include/agg_conv_unclose_polygon.h b/desmume/src/agg/include/agg_conv_unclose_polygon.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_conv_unclose_polygon.h
rename to desmume/src/agg/include/agg_conv_unclose_polygon.h
diff --git a/desmume/src/windows/agg/include/agg_curves.h b/desmume/src/agg/include/agg_curves.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_curves.h
rename to desmume/src/agg/include/agg_curves.h
diff --git a/desmume/src/windows/agg/include/agg_dda_line.h b/desmume/src/agg/include/agg_dda_line.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_dda_line.h
rename to desmume/src/agg/include/agg_dda_line.h
diff --git a/desmume/src/windows/agg/include/agg_ellipse.h b/desmume/src/agg/include/agg_ellipse.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_ellipse.h
rename to desmume/src/agg/include/agg_ellipse.h
diff --git a/desmume/src/windows/agg/include/agg_ellipse_bresenham.h b/desmume/src/agg/include/agg_ellipse_bresenham.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_ellipse_bresenham.h
rename to desmume/src/agg/include/agg_ellipse_bresenham.h
diff --git a/desmume/src/windows/agg/include/agg_embedded_raster_fonts.h b/desmume/src/agg/include/agg_embedded_raster_fonts.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_embedded_raster_fonts.h
rename to desmume/src/agg/include/agg_embedded_raster_fonts.h
diff --git a/desmume/src/windows/agg/include/agg_font_cache_manager.h b/desmume/src/agg/include/agg_font_cache_manager.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_font_cache_manager.h
rename to desmume/src/agg/include/agg_font_cache_manager.h
diff --git a/desmume/src/windows/agg/include/agg_gamma_functions.h b/desmume/src/agg/include/agg_gamma_functions.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_gamma_functions.h
rename to desmume/src/agg/include/agg_gamma_functions.h
diff --git a/desmume/src/windows/agg/include/agg_gamma_lut.h b/desmume/src/agg/include/agg_gamma_lut.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_gamma_lut.h
rename to desmume/src/agg/include/agg_gamma_lut.h
diff --git a/desmume/src/windows/agg/include/agg_glyph_raster_bin.h b/desmume/src/agg/include/agg_glyph_raster_bin.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_glyph_raster_bin.h
rename to desmume/src/agg/include/agg_glyph_raster_bin.h
diff --git a/desmume/src/windows/agg/include/agg_gradient_lut.h b/desmume/src/agg/include/agg_gradient_lut.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_gradient_lut.h
rename to desmume/src/agg/include/agg_gradient_lut.h
diff --git a/desmume/src/windows/agg/include/agg_gsv_text.h b/desmume/src/agg/include/agg_gsv_text.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_gsv_text.h
rename to desmume/src/agg/include/agg_gsv_text.h
diff --git a/desmume/src/windows/agg/include/agg_image_accessors.h b/desmume/src/agg/include/agg_image_accessors.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_image_accessors.h
rename to desmume/src/agg/include/agg_image_accessors.h
diff --git a/desmume/src/windows/agg/include/agg_image_filters.h b/desmume/src/agg/include/agg_image_filters.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_image_filters.h
rename to desmume/src/agg/include/agg_image_filters.h
diff --git a/desmume/src/windows/agg/include/agg_line_aa_basics.h b/desmume/src/agg/include/agg_line_aa_basics.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_line_aa_basics.h
rename to desmume/src/agg/include/agg_line_aa_basics.h
diff --git a/desmume/src/windows/agg/include/agg_math.h b/desmume/src/agg/include/agg_math.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_math.h
rename to desmume/src/agg/include/agg_math.h
diff --git a/desmume/src/windows/agg/include/agg_math_stroke.h b/desmume/src/agg/include/agg_math_stroke.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_math_stroke.h
rename to desmume/src/agg/include/agg_math_stroke.h
diff --git a/desmume/src/windows/agg/include/agg_path_length.h b/desmume/src/agg/include/agg_path_length.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_path_length.h
rename to desmume/src/agg/include/agg_path_length.h
diff --git a/desmume/src/windows/agg/include/agg_path_storage.h b/desmume/src/agg/include/agg_path_storage.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_path_storage.h
rename to desmume/src/agg/include/agg_path_storage.h
diff --git a/desmume/src/windows/agg/include/agg_path_storage_integer.h b/desmume/src/agg/include/agg_path_storage_integer.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_path_storage_integer.h
rename to desmume/src/agg/include/agg_path_storage_integer.h
diff --git a/desmume/src/windows/agg/include/agg_pattern_filters_rgba.h b/desmume/src/agg/include/agg_pattern_filters_rgba.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_pattern_filters_rgba.h
rename to desmume/src/agg/include/agg_pattern_filters_rgba.h
diff --git a/desmume/src/windows/agg/include/agg_pixfmt_amask_adaptor.h b/desmume/src/agg/include/agg_pixfmt_amask_adaptor.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_pixfmt_amask_adaptor.h
rename to desmume/src/agg/include/agg_pixfmt_amask_adaptor.h
diff --git a/desmume/src/windows/agg/include/agg_pixfmt_gray.h b/desmume/src/agg/include/agg_pixfmt_gray.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_pixfmt_gray.h
rename to desmume/src/agg/include/agg_pixfmt_gray.h
diff --git a/desmume/src/windows/agg/include/agg_pixfmt_rgb.h b/desmume/src/agg/include/agg_pixfmt_rgb.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_pixfmt_rgb.h
rename to desmume/src/agg/include/agg_pixfmt_rgb.h
diff --git a/desmume/src/windows/agg/include/agg_pixfmt_rgb_packed.h b/desmume/src/agg/include/agg_pixfmt_rgb_packed.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_pixfmt_rgb_packed.h
rename to desmume/src/agg/include/agg_pixfmt_rgb_packed.h
diff --git a/desmume/src/windows/agg/include/agg_pixfmt_rgba.h b/desmume/src/agg/include/agg_pixfmt_rgba.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_pixfmt_rgba.h
rename to desmume/src/agg/include/agg_pixfmt_rgba.h
diff --git a/desmume/src/windows/agg/include/agg_pixfmt_transposer.h b/desmume/src/agg/include/agg_pixfmt_transposer.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_pixfmt_transposer.h
rename to desmume/src/agg/include/agg_pixfmt_transposer.h
diff --git a/desmume/src/windows/agg/include/agg_rasterizer_cells_aa.h b/desmume/src/agg/include/agg_rasterizer_cells_aa.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_rasterizer_cells_aa.h
rename to desmume/src/agg/include/agg_rasterizer_cells_aa.h
diff --git a/desmume/src/windows/agg/include/agg_rasterizer_compound_aa.h b/desmume/src/agg/include/agg_rasterizer_compound_aa.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_rasterizer_compound_aa.h
rename to desmume/src/agg/include/agg_rasterizer_compound_aa.h
diff --git a/desmume/src/windows/agg/include/agg_rasterizer_outline.h b/desmume/src/agg/include/agg_rasterizer_outline.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_rasterizer_outline.h
rename to desmume/src/agg/include/agg_rasterizer_outline.h
diff --git a/desmume/src/windows/agg/include/agg_rasterizer_outline_aa.h b/desmume/src/agg/include/agg_rasterizer_outline_aa.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_rasterizer_outline_aa.h
rename to desmume/src/agg/include/agg_rasterizer_outline_aa.h
diff --git a/desmume/src/windows/agg/include/agg_rasterizer_scanline_aa.h b/desmume/src/agg/include/agg_rasterizer_scanline_aa.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_rasterizer_scanline_aa.h
rename to desmume/src/agg/include/agg_rasterizer_scanline_aa.h
diff --git a/desmume/src/windows/agg/include/agg_rasterizer_sl_clip.h b/desmume/src/agg/include/agg_rasterizer_sl_clip.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_rasterizer_sl_clip.h
rename to desmume/src/agg/include/agg_rasterizer_sl_clip.h
diff --git a/desmume/src/windows/agg/include/agg_renderer_base.h b/desmume/src/agg/include/agg_renderer_base.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_renderer_base.h
rename to desmume/src/agg/include/agg_renderer_base.h
diff --git a/desmume/src/windows/agg/include/agg_renderer_markers.h b/desmume/src/agg/include/agg_renderer_markers.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_renderer_markers.h
rename to desmume/src/agg/include/agg_renderer_markers.h
diff --git a/desmume/src/windows/agg/include/agg_renderer_mclip.h b/desmume/src/agg/include/agg_renderer_mclip.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_renderer_mclip.h
rename to desmume/src/agg/include/agg_renderer_mclip.h
diff --git a/desmume/src/windows/agg/include/agg_renderer_outline_aa.h b/desmume/src/agg/include/agg_renderer_outline_aa.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_renderer_outline_aa.h
rename to desmume/src/agg/include/agg_renderer_outline_aa.h
diff --git a/desmume/src/windows/agg/include/agg_renderer_outline_image.h b/desmume/src/agg/include/agg_renderer_outline_image.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_renderer_outline_image.h
rename to desmume/src/agg/include/agg_renderer_outline_image.h
diff --git a/desmume/src/windows/agg/include/agg_renderer_primitives.h b/desmume/src/agg/include/agg_renderer_primitives.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_renderer_primitives.h
rename to desmume/src/agg/include/agg_renderer_primitives.h
diff --git a/desmume/src/windows/agg/include/agg_renderer_raster_text.h b/desmume/src/agg/include/agg_renderer_raster_text.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_renderer_raster_text.h
rename to desmume/src/agg/include/agg_renderer_raster_text.h
diff --git a/desmume/src/windows/agg/include/agg_renderer_scanline.h b/desmume/src/agg/include/agg_renderer_scanline.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_renderer_scanline.h
rename to desmume/src/agg/include/agg_renderer_scanline.h
diff --git a/desmume/src/windows/agg/include/agg_rendering_buffer.h b/desmume/src/agg/include/agg_rendering_buffer.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_rendering_buffer.h
rename to desmume/src/agg/include/agg_rendering_buffer.h
diff --git a/desmume/src/windows/agg/include/agg_rendering_buffer_dynarow.h b/desmume/src/agg/include/agg_rendering_buffer_dynarow.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_rendering_buffer_dynarow.h
rename to desmume/src/agg/include/agg_rendering_buffer_dynarow.h
diff --git a/desmume/src/windows/agg/include/agg_rounded_rect.h b/desmume/src/agg/include/agg_rounded_rect.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_rounded_rect.h
rename to desmume/src/agg/include/agg_rounded_rect.h
diff --git a/desmume/src/windows/agg/include/agg_scanline_bin.h b/desmume/src/agg/include/agg_scanline_bin.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_scanline_bin.h
rename to desmume/src/agg/include/agg_scanline_bin.h
diff --git a/desmume/src/windows/agg/include/agg_scanline_boolean_algebra.h b/desmume/src/agg/include/agg_scanline_boolean_algebra.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_scanline_boolean_algebra.h
rename to desmume/src/agg/include/agg_scanline_boolean_algebra.h
diff --git a/desmume/src/windows/agg/include/agg_scanline_p.h b/desmume/src/agg/include/agg_scanline_p.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_scanline_p.h
rename to desmume/src/agg/include/agg_scanline_p.h
diff --git a/desmume/src/windows/agg/include/agg_scanline_storage_aa.h b/desmume/src/agg/include/agg_scanline_storage_aa.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_scanline_storage_aa.h
rename to desmume/src/agg/include/agg_scanline_storage_aa.h
diff --git a/desmume/src/windows/agg/include/agg_scanline_storage_bin.h b/desmume/src/agg/include/agg_scanline_storage_bin.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_scanline_storage_bin.h
rename to desmume/src/agg/include/agg_scanline_storage_bin.h
diff --git a/desmume/src/windows/agg/include/agg_scanline_u.h b/desmume/src/agg/include/agg_scanline_u.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_scanline_u.h
rename to desmume/src/agg/include/agg_scanline_u.h
diff --git a/desmume/src/windows/agg/include/agg_shorten_path.h b/desmume/src/agg/include/agg_shorten_path.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_shorten_path.h
rename to desmume/src/agg/include/agg_shorten_path.h
diff --git a/desmume/src/windows/agg/include/agg_simul_eq.h b/desmume/src/agg/include/agg_simul_eq.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_simul_eq.h
rename to desmume/src/agg/include/agg_simul_eq.h
diff --git a/desmume/src/windows/agg/include/agg_span_allocator.h b/desmume/src/agg/include/agg_span_allocator.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_allocator.h
rename to desmume/src/agg/include/agg_span_allocator.h
diff --git a/desmume/src/windows/agg/include/agg_span_converter.h b/desmume/src/agg/include/agg_span_converter.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_converter.h
rename to desmume/src/agg/include/agg_span_converter.h
diff --git a/desmume/src/windows/agg/include/agg_span_gouraud.h b/desmume/src/agg/include/agg_span_gouraud.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_gouraud.h
rename to desmume/src/agg/include/agg_span_gouraud.h
diff --git a/desmume/src/windows/agg/include/agg_span_gouraud_gray.h b/desmume/src/agg/include/agg_span_gouraud_gray.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_gouraud_gray.h
rename to desmume/src/agg/include/agg_span_gouraud_gray.h
diff --git a/desmume/src/windows/agg/include/agg_span_gouraud_rgba.h b/desmume/src/agg/include/agg_span_gouraud_rgba.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_gouraud_rgba.h
rename to desmume/src/agg/include/agg_span_gouraud_rgba.h
diff --git a/desmume/src/windows/agg/include/agg_span_gradient.h b/desmume/src/agg/include/agg_span_gradient.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_gradient.h
rename to desmume/src/agg/include/agg_span_gradient.h
diff --git a/desmume/src/windows/agg/include/agg_span_gradient_alpha.h b/desmume/src/agg/include/agg_span_gradient_alpha.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_gradient_alpha.h
rename to desmume/src/agg/include/agg_span_gradient_alpha.h
diff --git a/desmume/src/windows/agg/include/agg_span_image_filter.h b/desmume/src/agg/include/agg_span_image_filter.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_image_filter.h
rename to desmume/src/agg/include/agg_span_image_filter.h
diff --git a/desmume/src/windows/agg/include/agg_span_image_filter_gray.h b/desmume/src/agg/include/agg_span_image_filter_gray.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_image_filter_gray.h
rename to desmume/src/agg/include/agg_span_image_filter_gray.h
diff --git a/desmume/src/windows/agg/include/agg_span_image_filter_rgb.h b/desmume/src/agg/include/agg_span_image_filter_rgb.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_image_filter_rgb.h
rename to desmume/src/agg/include/agg_span_image_filter_rgb.h
diff --git a/desmume/src/windows/agg/include/agg_span_image_filter_rgba.h b/desmume/src/agg/include/agg_span_image_filter_rgba.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_image_filter_rgba.h
rename to desmume/src/agg/include/agg_span_image_filter_rgba.h
diff --git a/desmume/src/windows/agg/include/agg_span_interpolator_adaptor.h b/desmume/src/agg/include/agg_span_interpolator_adaptor.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_interpolator_adaptor.h
rename to desmume/src/agg/include/agg_span_interpolator_adaptor.h
diff --git a/desmume/src/windows/agg/include/agg_span_interpolator_linear.h b/desmume/src/agg/include/agg_span_interpolator_linear.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_interpolator_linear.h
rename to desmume/src/agg/include/agg_span_interpolator_linear.h
diff --git a/desmume/src/windows/agg/include/agg_span_interpolator_persp.h b/desmume/src/agg/include/agg_span_interpolator_persp.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_interpolator_persp.h
rename to desmume/src/agg/include/agg_span_interpolator_persp.h
diff --git a/desmume/src/windows/agg/include/agg_span_interpolator_trans.h b/desmume/src/agg/include/agg_span_interpolator_trans.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_interpolator_trans.h
rename to desmume/src/agg/include/agg_span_interpolator_trans.h
diff --git a/desmume/src/windows/agg/include/agg_span_pattern_gray.h b/desmume/src/agg/include/agg_span_pattern_gray.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_pattern_gray.h
rename to desmume/src/agg/include/agg_span_pattern_gray.h
diff --git a/desmume/src/windows/agg/include/agg_span_pattern_rgb.h b/desmume/src/agg/include/agg_span_pattern_rgb.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_pattern_rgb.h
rename to desmume/src/agg/include/agg_span_pattern_rgb.h
diff --git a/desmume/src/windows/agg/include/agg_span_pattern_rgba.h b/desmume/src/agg/include/agg_span_pattern_rgba.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_pattern_rgba.h
rename to desmume/src/agg/include/agg_span_pattern_rgba.h
diff --git a/desmume/src/windows/agg/include/agg_span_solid.h b/desmume/src/agg/include/agg_span_solid.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_solid.h
rename to desmume/src/agg/include/agg_span_solid.h
diff --git a/desmume/src/windows/agg/include/agg_span_subdiv_adaptor.h b/desmume/src/agg/include/agg_span_subdiv_adaptor.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_span_subdiv_adaptor.h
rename to desmume/src/agg/include/agg_span_subdiv_adaptor.h
diff --git a/desmume/src/windows/agg/include/agg_trans_affine.h b/desmume/src/agg/include/agg_trans_affine.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_trans_affine.h
rename to desmume/src/agg/include/agg_trans_affine.h
diff --git a/desmume/src/windows/agg/include/agg_trans_bilinear.h b/desmume/src/agg/include/agg_trans_bilinear.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_trans_bilinear.h
rename to desmume/src/agg/include/agg_trans_bilinear.h
diff --git a/desmume/src/windows/agg/include/agg_trans_double_path.h b/desmume/src/agg/include/agg_trans_double_path.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_trans_double_path.h
rename to desmume/src/agg/include/agg_trans_double_path.h
diff --git a/desmume/src/windows/agg/include/agg_trans_perspective.h b/desmume/src/agg/include/agg_trans_perspective.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_trans_perspective.h
rename to desmume/src/agg/include/agg_trans_perspective.h
diff --git a/desmume/src/windows/agg/include/agg_trans_single_path.h b/desmume/src/agg/include/agg_trans_single_path.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_trans_single_path.h
rename to desmume/src/agg/include/agg_trans_single_path.h
diff --git a/desmume/src/windows/agg/include/agg_trans_viewport.h b/desmume/src/agg/include/agg_trans_viewport.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_trans_viewport.h
rename to desmume/src/agg/include/agg_trans_viewport.h
diff --git a/desmume/src/windows/agg/include/agg_trans_warp_magnifier.h b/desmume/src/agg/include/agg_trans_warp_magnifier.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_trans_warp_magnifier.h
rename to desmume/src/agg/include/agg_trans_warp_magnifier.h
diff --git a/desmume/src/windows/agg/include/agg_vcgen_bspline.h b/desmume/src/agg/include/agg_vcgen_bspline.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vcgen_bspline.h
rename to desmume/src/agg/include/agg_vcgen_bspline.h
diff --git a/desmume/src/windows/agg/include/agg_vcgen_contour.h b/desmume/src/agg/include/agg_vcgen_contour.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vcgen_contour.h
rename to desmume/src/agg/include/agg_vcgen_contour.h
diff --git a/desmume/src/windows/agg/include/agg_vcgen_dash.h b/desmume/src/agg/include/agg_vcgen_dash.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vcgen_dash.h
rename to desmume/src/agg/include/agg_vcgen_dash.h
diff --git a/desmume/src/windows/agg/include/agg_vcgen_markers_term.h b/desmume/src/agg/include/agg_vcgen_markers_term.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vcgen_markers_term.h
rename to desmume/src/agg/include/agg_vcgen_markers_term.h
diff --git a/desmume/src/windows/agg/include/agg_vcgen_smooth_poly1.h b/desmume/src/agg/include/agg_vcgen_smooth_poly1.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vcgen_smooth_poly1.h
rename to desmume/src/agg/include/agg_vcgen_smooth_poly1.h
diff --git a/desmume/src/windows/agg/include/agg_vcgen_stroke.h b/desmume/src/agg/include/agg_vcgen_stroke.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vcgen_stroke.h
rename to desmume/src/agg/include/agg_vcgen_stroke.h
diff --git a/desmume/src/windows/agg/include/agg_vcgen_vertex_sequence.h b/desmume/src/agg/include/agg_vcgen_vertex_sequence.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vcgen_vertex_sequence.h
rename to desmume/src/agg/include/agg_vcgen_vertex_sequence.h
diff --git a/desmume/src/windows/agg/include/agg_vertex_sequence.h b/desmume/src/agg/include/agg_vertex_sequence.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vertex_sequence.h
rename to desmume/src/agg/include/agg_vertex_sequence.h
diff --git a/desmume/src/windows/agg/include/agg_vpgen_clip_polygon.h b/desmume/src/agg/include/agg_vpgen_clip_polygon.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vpgen_clip_polygon.h
rename to desmume/src/agg/include/agg_vpgen_clip_polygon.h
diff --git a/desmume/src/windows/agg/include/agg_vpgen_clip_polyline.h b/desmume/src/agg/include/agg_vpgen_clip_polyline.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vpgen_clip_polyline.h
rename to desmume/src/agg/include/agg_vpgen_clip_polyline.h
diff --git a/desmume/src/windows/agg/include/agg_vpgen_segmentator.h b/desmume/src/agg/include/agg_vpgen_segmentator.h
similarity index 100%
rename from desmume/src/windows/agg/include/agg_vpgen_segmentator.h
rename to desmume/src/agg/include/agg_vpgen_segmentator.h
diff --git a/desmume/src/windows/agg/include/ctrl/agg_bezier_ctrl.h b/desmume/src/agg/include/ctrl/agg_bezier_ctrl.h
similarity index 100%
rename from desmume/src/windows/agg/include/ctrl/agg_bezier_ctrl.h
rename to desmume/src/agg/include/ctrl/agg_bezier_ctrl.h
diff --git a/desmume/src/windows/agg/include/ctrl/agg_cbox_ctrl.h b/desmume/src/agg/include/ctrl/agg_cbox_ctrl.h
similarity index 100%
rename from desmume/src/windows/agg/include/ctrl/agg_cbox_ctrl.h
rename to desmume/src/agg/include/ctrl/agg_cbox_ctrl.h
diff --git a/desmume/src/windows/agg/include/ctrl/agg_ctrl.h b/desmume/src/agg/include/ctrl/agg_ctrl.h
similarity index 100%
rename from desmume/src/windows/agg/include/ctrl/agg_ctrl.h
rename to desmume/src/agg/include/ctrl/agg_ctrl.h
diff --git a/desmume/src/windows/agg/include/ctrl/agg_gamma_ctrl.h b/desmume/src/agg/include/ctrl/agg_gamma_ctrl.h
similarity index 100%
rename from desmume/src/windows/agg/include/ctrl/agg_gamma_ctrl.h
rename to desmume/src/agg/include/ctrl/agg_gamma_ctrl.h
diff --git a/desmume/src/windows/agg/include/ctrl/agg_gamma_spline.h b/desmume/src/agg/include/ctrl/agg_gamma_spline.h
similarity index 100%
rename from desmume/src/windows/agg/include/ctrl/agg_gamma_spline.h
rename to desmume/src/agg/include/ctrl/agg_gamma_spline.h
diff --git a/desmume/src/windows/agg/include/ctrl/agg_polygon_ctrl.h b/desmume/src/agg/include/ctrl/agg_polygon_ctrl.h
similarity index 100%
rename from desmume/src/windows/agg/include/ctrl/agg_polygon_ctrl.h
rename to desmume/src/agg/include/ctrl/agg_polygon_ctrl.h
diff --git a/desmume/src/windows/agg/include/ctrl/agg_rbox_ctrl.h b/desmume/src/agg/include/ctrl/agg_rbox_ctrl.h
similarity index 100%
rename from desmume/src/windows/agg/include/ctrl/agg_rbox_ctrl.h
rename to desmume/src/agg/include/ctrl/agg_rbox_ctrl.h
diff --git a/desmume/src/windows/agg/include/ctrl/agg_scale_ctrl.h b/desmume/src/agg/include/ctrl/agg_scale_ctrl.h
similarity index 100%
rename from desmume/src/windows/agg/include/ctrl/agg_scale_ctrl.h
rename to desmume/src/agg/include/ctrl/agg_scale_ctrl.h
diff --git a/desmume/src/windows/agg/include/ctrl/agg_slider_ctrl.h b/desmume/src/agg/include/ctrl/agg_slider_ctrl.h
similarity index 100%
rename from desmume/src/windows/agg/include/ctrl/agg_slider_ctrl.h
rename to desmume/src/agg/include/ctrl/agg_slider_ctrl.h
diff --git a/desmume/src/windows/agg/include/ctrl/agg_spline_ctrl.h b/desmume/src/agg/include/ctrl/agg_spline_ctrl.h
similarity index 100%
rename from desmume/src/windows/agg/include/ctrl/agg_spline_ctrl.h
rename to desmume/src/agg/include/ctrl/agg_spline_ctrl.h
diff --git a/desmume/src/windows/agg/include/platform/agg_platform_support.h b/desmume/src/agg/include/platform/agg_platform_support.h
similarity index 100%
rename from desmume/src/windows/agg/include/platform/agg_platform_support.h
rename to desmume/src/agg/include/platform/agg_platform_support.h
diff --git a/desmume/src/windows/agg/include/platform/mac/agg_mac_pmap.h b/desmume/src/agg/include/platform/mac/agg_mac_pmap.h
similarity index 100%
rename from desmume/src/windows/agg/include/platform/mac/agg_mac_pmap.h
rename to desmume/src/agg/include/platform/mac/agg_mac_pmap.h
diff --git a/desmume/src/windows/agg/include/platform/win32/agg_win32_bmp.h b/desmume/src/agg/include/platform/win32/agg_win32_bmp.h
similarity index 100%
rename from desmume/src/windows/agg/include/platform/win32/agg_win32_bmp.h
rename to desmume/src/agg/include/platform/win32/agg_win32_bmp.h
diff --git a/desmume/src/windows/agg/include/util/agg_color_conv.h b/desmume/src/agg/include/util/agg_color_conv.h
similarity index 100%
rename from desmume/src/windows/agg/include/util/agg_color_conv.h
rename to desmume/src/agg/include/util/agg_color_conv.h
diff --git a/desmume/src/windows/agg/include/util/agg_color_conv_rgb16.h b/desmume/src/agg/include/util/agg_color_conv_rgb16.h
similarity index 100%
rename from desmume/src/windows/agg/include/util/agg_color_conv_rgb16.h
rename to desmume/src/agg/include/util/agg_color_conv_rgb16.h
diff --git a/desmume/src/windows/agg/include/util/agg_color_conv_rgb8.h b/desmume/src/agg/include/util/agg_color_conv_rgb8.h
similarity index 100%
rename from desmume/src/windows/agg/include/util/agg_color_conv_rgb8.h
rename to desmume/src/agg/include/util/agg_color_conv_rgb8.h
diff --git a/desmume/src/windows/agg/src/ChangeLog b/desmume/src/agg/src/ChangeLog
similarity index 100%
rename from desmume/src/windows/agg/src/ChangeLog
rename to desmume/src/agg/src/ChangeLog
diff --git a/desmume/src/windows/agg/src/Makefile b/desmume/src/agg/src/Makefile
similarity index 100%
rename from desmume/src/windows/agg/src/Makefile
rename to desmume/src/agg/src/Makefile
diff --git a/desmume/src/windows/agg/src/agg_arc.cpp b/desmume/src/agg/src/agg_arc.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_arc.cpp
rename to desmume/src/agg/src/agg_arc.cpp
diff --git a/desmume/src/windows/agg/src/agg_arrowhead.cpp b/desmume/src/agg/src/agg_arrowhead.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_arrowhead.cpp
rename to desmume/src/agg/src/agg_arrowhead.cpp
diff --git a/desmume/src/windows/agg/src/agg_bezier_arc.cpp b/desmume/src/agg/src/agg_bezier_arc.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_bezier_arc.cpp
rename to desmume/src/agg/src/agg_bezier_arc.cpp
diff --git a/desmume/src/windows/agg/src/agg_bspline.cpp b/desmume/src/agg/src/agg_bspline.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_bspline.cpp
rename to desmume/src/agg/src/agg_bspline.cpp
diff --git a/desmume/src/windows/agg/src/agg_curves.cpp b/desmume/src/agg/src/agg_curves.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_curves.cpp
rename to desmume/src/agg/src/agg_curves.cpp
diff --git a/desmume/src/windows/agg/src/agg_embedded_raster_fonts.cpp b/desmume/src/agg/src/agg_embedded_raster_fonts.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_embedded_raster_fonts.cpp
rename to desmume/src/agg/src/agg_embedded_raster_fonts.cpp
diff --git a/desmume/src/windows/agg/src/agg_gsv_text.cpp b/desmume/src/agg/src/agg_gsv_text.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_gsv_text.cpp
rename to desmume/src/agg/src/agg_gsv_text.cpp
diff --git a/desmume/src/windows/agg/src/agg_image_filters.cpp b/desmume/src/agg/src/agg_image_filters.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_image_filters.cpp
rename to desmume/src/agg/src/agg_image_filters.cpp
diff --git a/desmume/src/windows/agg/src/agg_line_aa_basics.cpp b/desmume/src/agg/src/agg_line_aa_basics.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_line_aa_basics.cpp
rename to desmume/src/agg/src/agg_line_aa_basics.cpp
diff --git a/desmume/src/windows/agg/src/agg_line_profile_aa.cpp b/desmume/src/agg/src/agg_line_profile_aa.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_line_profile_aa.cpp
rename to desmume/src/agg/src/agg_line_profile_aa.cpp
diff --git a/desmume/src/windows/agg/src/agg_rounded_rect.cpp b/desmume/src/agg/src/agg_rounded_rect.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_rounded_rect.cpp
rename to desmume/src/agg/src/agg_rounded_rect.cpp
diff --git a/desmume/src/windows/agg/src/agg_sqrt_tables.cpp b/desmume/src/agg/src/agg_sqrt_tables.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_sqrt_tables.cpp
rename to desmume/src/agg/src/agg_sqrt_tables.cpp
diff --git a/desmume/src/windows/agg/src/agg_trans_affine.cpp b/desmume/src/agg/src/agg_trans_affine.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_trans_affine.cpp
rename to desmume/src/agg/src/agg_trans_affine.cpp
diff --git a/desmume/src/windows/agg/src/agg_trans_double_path.cpp b/desmume/src/agg/src/agg_trans_double_path.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_trans_double_path.cpp
rename to desmume/src/agg/src/agg_trans_double_path.cpp
diff --git a/desmume/src/windows/agg/src/agg_trans_single_path.cpp b/desmume/src/agg/src/agg_trans_single_path.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_trans_single_path.cpp
rename to desmume/src/agg/src/agg_trans_single_path.cpp
diff --git a/desmume/src/windows/agg/src/agg_trans_warp_magnifier.cpp b/desmume/src/agg/src/agg_trans_warp_magnifier.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_trans_warp_magnifier.cpp
rename to desmume/src/agg/src/agg_trans_warp_magnifier.cpp
diff --git a/desmume/src/windows/agg/src/agg_vcgen_bspline.cpp b/desmume/src/agg/src/agg_vcgen_bspline.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_vcgen_bspline.cpp
rename to desmume/src/agg/src/agg_vcgen_bspline.cpp
diff --git a/desmume/src/windows/agg/src/agg_vcgen_contour.cpp b/desmume/src/agg/src/agg_vcgen_contour.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_vcgen_contour.cpp
rename to desmume/src/agg/src/agg_vcgen_contour.cpp
diff --git a/desmume/src/windows/agg/src/agg_vcgen_dash.cpp b/desmume/src/agg/src/agg_vcgen_dash.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_vcgen_dash.cpp
rename to desmume/src/agg/src/agg_vcgen_dash.cpp
diff --git a/desmume/src/windows/agg/src/agg_vcgen_markers_term.cpp b/desmume/src/agg/src/agg_vcgen_markers_term.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_vcgen_markers_term.cpp
rename to desmume/src/agg/src/agg_vcgen_markers_term.cpp
diff --git a/desmume/src/windows/agg/src/agg_vcgen_smooth_poly1.cpp b/desmume/src/agg/src/agg_vcgen_smooth_poly1.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_vcgen_smooth_poly1.cpp
rename to desmume/src/agg/src/agg_vcgen_smooth_poly1.cpp
diff --git a/desmume/src/windows/agg/src/agg_vcgen_stroke.cpp b/desmume/src/agg/src/agg_vcgen_stroke.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_vcgen_stroke.cpp
rename to desmume/src/agg/src/agg_vcgen_stroke.cpp
diff --git a/desmume/src/windows/agg/src/agg_vpgen_clip_polygon.cpp b/desmume/src/agg/src/agg_vpgen_clip_polygon.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_vpgen_clip_polygon.cpp
rename to desmume/src/agg/src/agg_vpgen_clip_polygon.cpp
diff --git a/desmume/src/windows/agg/src/agg_vpgen_clip_polyline.cpp b/desmume/src/agg/src/agg_vpgen_clip_polyline.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_vpgen_clip_polyline.cpp
rename to desmume/src/agg/src/agg_vpgen_clip_polyline.cpp
diff --git a/desmume/src/windows/agg/src/agg_vpgen_segmentator.cpp b/desmume/src/agg/src/agg_vpgen_segmentator.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/agg_vpgen_segmentator.cpp
rename to desmume/src/agg/src/agg_vpgen_segmentator.cpp
diff --git a/desmume/src/windows/agg/src/authors b/desmume/src/agg/src/authors
similarity index 100%
rename from desmume/src/windows/agg/src/authors
rename to desmume/src/agg/src/authors
diff --git a/desmume/src/windows/agg/src/autogen.sh b/desmume/src/agg/src/autogen.sh
similarity index 100%
rename from desmume/src/windows/agg/src/autogen.sh
rename to desmume/src/agg/src/autogen.sh
diff --git a/desmume/src/windows/agg/src/configure.in b/desmume/src/agg/src/configure.in
similarity index 100%
rename from desmume/src/windows/agg/src/configure.in
rename to desmume/src/agg/src/configure.in
diff --git a/desmume/src/windows/agg/src/copying b/desmume/src/agg/src/copying
similarity index 100%
rename from desmume/src/windows/agg/src/copying
rename to desmume/src/agg/src/copying
diff --git a/desmume/src/windows/agg/src/ctrl/agg_bezier_ctrl.cpp b/desmume/src/agg/src/ctrl/agg_bezier_ctrl.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/ctrl/agg_bezier_ctrl.cpp
rename to desmume/src/agg/src/ctrl/agg_bezier_ctrl.cpp
diff --git a/desmume/src/windows/agg/src/ctrl/agg_cbox_ctrl.cpp b/desmume/src/agg/src/ctrl/agg_cbox_ctrl.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/ctrl/agg_cbox_ctrl.cpp
rename to desmume/src/agg/src/ctrl/agg_cbox_ctrl.cpp
diff --git a/desmume/src/windows/agg/src/ctrl/agg_gamma_ctrl.cpp b/desmume/src/agg/src/ctrl/agg_gamma_ctrl.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/ctrl/agg_gamma_ctrl.cpp
rename to desmume/src/agg/src/ctrl/agg_gamma_ctrl.cpp
diff --git a/desmume/src/windows/agg/src/ctrl/agg_gamma_spline.cpp b/desmume/src/agg/src/ctrl/agg_gamma_spline.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/ctrl/agg_gamma_spline.cpp
rename to desmume/src/agg/src/ctrl/agg_gamma_spline.cpp
diff --git a/desmume/src/windows/agg/src/ctrl/agg_polygon_ctrl.cpp b/desmume/src/agg/src/ctrl/agg_polygon_ctrl.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/ctrl/agg_polygon_ctrl.cpp
rename to desmume/src/agg/src/ctrl/agg_polygon_ctrl.cpp
diff --git a/desmume/src/windows/agg/src/ctrl/agg_rbox_ctrl.cpp b/desmume/src/agg/src/ctrl/agg_rbox_ctrl.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/ctrl/agg_rbox_ctrl.cpp
rename to desmume/src/agg/src/ctrl/agg_rbox_ctrl.cpp
diff --git a/desmume/src/windows/agg/src/ctrl/agg_scale_ctrl.cpp b/desmume/src/agg/src/ctrl/agg_scale_ctrl.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/ctrl/agg_scale_ctrl.cpp
rename to desmume/src/agg/src/ctrl/agg_scale_ctrl.cpp
diff --git a/desmume/src/windows/agg/src/ctrl/agg_slider_ctrl.cpp b/desmume/src/agg/src/ctrl/agg_slider_ctrl.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/ctrl/agg_slider_ctrl.cpp
rename to desmume/src/agg/src/ctrl/agg_slider_ctrl.cpp
diff --git a/desmume/src/windows/agg/src/ctrl/agg_spline_ctrl.cpp b/desmume/src/agg/src/ctrl/agg_spline_ctrl.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/ctrl/agg_spline_ctrl.cpp
rename to desmume/src/agg/src/ctrl/agg_spline_ctrl.cpp
diff --git a/desmume/src/windows/agg/src/install b/desmume/src/agg/src/install
similarity index 100%
rename from desmume/src/windows/agg/src/install
rename to desmume/src/agg/src/install
diff --git a/desmume/src/windows/agg/src/news b/desmume/src/agg/src/news
similarity index 100%
rename from desmume/src/windows/agg/src/news
rename to desmume/src/agg/src/news
diff --git a/desmume/src/windows/agg/src/platform/win32/agg_platform_support.cpp b/desmume/src/agg/src/platform/win32/agg_platform_support.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/platform/win32/agg_platform_support.cpp
rename to desmume/src/agg/src/platform/win32/agg_platform_support.cpp
diff --git a/desmume/src/windows/agg/src/platform/win32/agg_win32_bmp.cpp b/desmume/src/agg/src/platform/win32/agg_win32_bmp.cpp
similarity index 100%
rename from desmume/src/windows/agg/src/platform/win32/agg_win32_bmp.cpp
rename to desmume/src/agg/src/platform/win32/agg_win32_bmp.cpp
diff --git a/desmume/src/windows/agg/src/readme b/desmume/src/agg/src/readme
similarity index 100%
rename from desmume/src/windows/agg/src/readme
rename to desmume/src/agg/src/readme
diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index 645ec84f9..83eb3d36a 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -51,7 +51,7 @@
 				FavorSizeOrSpeed="0"
 				EnableFiberSafeOptimizations="false"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;..\agg\include;..\agg\examples"
 				PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;WIN32;SPU_INTERPOLATE;HAVE_LIBZ;HAVE_LIBZZIP;NOMINMAX;DEBUG;EXPERIMENTAL_WIFI"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="0"
@@ -145,7 +145,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;..\agg\include;..\agg\examples"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SPU_INTERPOLATE;NOMINMAX;NDEBUG;RELEASE;EXPERIMENTAL_WIFI"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -243,7 +243,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;..\agg\include;..\agg\examples"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SPU_INTERPOLATE;NOMINMAX;NDEBUG;RELEASE;EXPERIMENTAL_WIFI"
 				StringPooling="true"
 				ExceptionHandling="1"
diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index b063204ef..04e735b64 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -52,7 +52,7 @@
 				FavorSizeOrSpeed="0"
 				EnableFiberSafeOptimizations="false"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;..\agg\include;..\agg\examples"
 				PreprocessorDefinitions="DEBUG;_CRT_SECURE_NO_DEPRECATE;WIN32;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;EXPERIMENTAL_WIFI;HAVE_LIBZ;HAVE_LIBZZIP"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -142,7 +142,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;..\agg\include;..\agg\examples"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -235,7 +235,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;.\agg\include;.\agg\examples"
+				AdditionalIncludeDirectories=".;..;&quot;lua\lua-5.1.4\src&quot;;&quot;glib-2.20.1\build&quot;;&quot;glib-2.20.1\build\glib&quot;;.\zlib123;.\zziplib;.\winpcap;userconfig;defaultconfig;.\7z;..\agg\include;..\agg\examples"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;SPU_INTERPOLATE;NOMINMAX;RELEASE;EXPERIMENTAL_WIFI;NDEBUG"
 				StringPooling="true"
 				ExceptionHandling="1"