From 6d1bee6256d51971c9f73f412bb7be60934f42ad Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Sun, 20 Oct 2013 00:50:31 -0700 Subject: [PATCH] remove visualc platform code. remove Thread Building Blocks usage. --- Makefile.am | 2 +- Makefile.in | 2 +- configure | 6 +- configure.ac | 5 - include/render.h | 4 - src/dosbox.cpp | 3 - src/gui/menu.cpp | 10 - src/gui/render.cpp | 10 - src/gui/sdlmain.cpp | 148 ----- src/platform/Makefile.am | 4 +- src/platform/Makefile.in | 2 +- src/platform/visualc/Makefile.am | 1 - src/platform/visualc/Makefile.in | 379 ------------- src/platform/visualc/config.h | 95 ---- src/platform/visualc/ntddcdrm.h | 320 ----------- src/platform/visualc/ntddscsi.h | 174 ------ src/platform/visualc/stdint.h | 18 - src/platform/visualc/unistd.h | 10 - visualc_net/Makefile.am | 1 - visualc_net/Makefile.in | 379 ------------- visualc_net/dosbox.sln | 21 - visualc_net/dosbox.v12.suo | Bin 10752 -> 0 bytes visualc_net/dosbox.vcproj | 880 ----------------------------- visualc_net/dosbox.vcxproj | 556 ------------------ visualc_net/dosbox.vcxproj.filters | 712 ----------------------- 25 files changed, 6 insertions(+), 3736 deletions(-) delete mode 100644 src/platform/visualc/Makefile.am delete mode 100644 src/platform/visualc/Makefile.in delete mode 100644 src/platform/visualc/config.h delete mode 100644 src/platform/visualc/ntddcdrm.h delete mode 100644 src/platform/visualc/ntddscsi.h delete mode 100644 src/platform/visualc/stdint.h delete mode 100644 src/platform/visualc/unistd.h delete mode 100644 visualc_net/Makefile.am delete mode 100644 visualc_net/Makefile.in delete mode 100644 visualc_net/dosbox.sln delete mode 100644 visualc_net/dosbox.v12.suo delete mode 100644 visualc_net/dosbox.vcproj delete mode 100644 visualc_net/dosbox.vcxproj delete mode 100644 visualc_net/dosbox.vcxproj.filters diff --git a/Makefile.am b/Makefile.am index 1ace83bcb..30dee6bc2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ # Main Makefile for DOSBox EXTRA_DIST = autogen.sh -SUBDIRS = src include docs visualc_net +SUBDIRS = src include docs diff --git a/Makefile.in b/Makefile.in index 2ae8dd4e4..e709ebb9b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -276,7 +276,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = autogen.sh -SUBDIRS = src include docs visualc_net +SUBDIRS = src include docs all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/configure b/configure index d42ca55c9..a57d889be 100755 --- a/configure +++ b/configure @@ -4931,8 +4931,6 @@ CXXFLAGS="$CXXFLAGS -std=gnu++11" CXXFLAGS="$CXXFLAGS -mmmx -msse -msse2" -LDFLAGS="$LDFLAGS -ltbb" - if test x$host = xi386-pc-os2-emx ; then CXXFLAGS="$CXXFLAGS -Zmt" LDFLAGS="$LDFLAGS -Zomf -Zmt" @@ -8020,7 +8018,7 @@ fi -ac_config_files="$ac_config_files Makefile src/Makefile src/cpu/Makefile src/cpu/core_full/Makefile src/cpu/core_normal/Makefile src/cpu/core_dyn_x86/Makefile src/cpu/core_dynrec/Makefile src/debug/Makefile src/dos/Makefile src/fpu/Makefile src/gui/Makefile src/hardware/Makefile src/hardware/serialport/Makefile src/hardware/reSID/Makefile src/hardware/parport/Makefile src/ints/Makefile src/libs/Makefile src/libs/zmbv/Makefile src/libs/gui_tk/Makefile src/libs/porttalk/Makefile src/misc/Makefile src/shell/Makefile src/platform/Makefile src/platform/visualc/Makefile visualc_net/Makefile include/Makefile docs/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/cpu/Makefile src/cpu/core_full/Makefile src/cpu/core_normal/Makefile src/cpu/core_dyn_x86/Makefile src/cpu/core_dynrec/Makefile src/debug/Makefile src/dos/Makefile src/fpu/Makefile src/gui/Makefile src/hardware/Makefile src/hardware/serialport/Makefile src/hardware/reSID/Makefile src/hardware/parport/Makefile src/ints/Makefile src/libs/Makefile src/libs/zmbv/Makefile src/libs/gui_tk/Makefile src/libs/porttalk/Makefile src/misc/Makefile src/shell/Makefile src/platform/Makefile include/Makefile docs/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -8781,8 +8779,6 @@ do "src/misc/Makefile") CONFIG_FILES="$CONFIG_FILES src/misc/Makefile" ;; "src/shell/Makefile") CONFIG_FILES="$CONFIG_FILES src/shell/Makefile" ;; "src/platform/Makefile") CONFIG_FILES="$CONFIG_FILES src/platform/Makefile" ;; - "src/platform/visualc/Makefile") CONFIG_FILES="$CONFIG_FILES src/platform/visualc/Makefile" ;; - "visualc_net/Makefile") CONFIG_FILES="$CONFIG_FILES visualc_net/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; diff --git a/configure.ac b/configure.ac index 679d15437..167d589b4 100644 --- a/configure.ac +++ b/configure.ac @@ -25,9 +25,6 @@ CXXFLAGS="$CXXFLAGS -std=gnu++11" dnl Scalars in the code use MMX/SSE intrinsics CXXFLAGS="$CXXFLAGS -mmmx -msse -msse2" -dnl this uses Thread Building Blocks, apparently -LDFLAGS="$LDFLAGS -ltbb" - dnl Some needed libaries for OS2 dnl perharps join this with the other target depended checks. move them upwards if test x$host = xi386-pc-os2-emx ; then @@ -604,8 +601,6 @@ src/libs/porttalk/Makefile src/misc/Makefile src/shell/Makefile src/platform/Makefile -src/platform/visualc/Makefile -visualc_net/Makefile include/Makefile docs/Makefile ]) diff --git a/include/render.h b/include/render.h index edc53c30a..9ae2e28d4 100644 --- a/include/render.h +++ b/include/render.h @@ -30,7 +30,6 @@ #define RENDER_SKIP_CACHE 16 //Enable this for scalers to support 0 input for empty lines //#define RENDER_NULL_INPUT -#define xBRZ_w_TBB 1 typedef struct { struct { @@ -90,9 +89,6 @@ typedef struct { bool fullFrame; bool forceUpdate; bool autofit; -#if defined (xBRZ_w_TBB) - bool xbrz_using; -#endif } Render_t; extern Render_t render; diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 3e7a13a9f..367f5d789 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -687,9 +687,6 @@ void DOSBOX_Init(void) { "tv2x", "tv3x", "rgb2x", "rgb3x", "scan2x", "scan3x", #endif "hardware_none", "hardware2x", "hardware3x", "hardware4x", "hardware5x", -#if defined (xBRZ_w_TBB) - "xbrz", -#endif 0 }; Pstring->Set_values(scalers); diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp index 846d23181..4deb7e781 100644 --- a/src/gui/menu.cpp +++ b/src/gui/menu.cpp @@ -1155,12 +1155,7 @@ int Reflect_Menu(void) { safe_strncpy(res, windowresolution, sizeof(res)); windowresolution = lowcase(res);//so x and X are allowed CheckMenuItem(m_handle, ID_USESCANCODES, (sec->Get_bool("usescancodes")) ? MF_CHECKED : MF_STRING); -#if defined (xBRZ_w_TBB) - CheckMenuItem(m_handle, ID_NONE, !render.xbrz_using && SCALER_SW_2(scalerOpNormal, 1) ? MF_CHECKED : MF_STRING); - CheckMenuItem(m_handle, ID_XBRZ, render.xbrz_using && SCALER_SW_2(scalerOpNormal, 1) ? MF_CHECKED : MF_STRING); -#else CheckMenuItem(m_handle, ID_NONE, SCALER_SW_2(scalerOpNormal, 1) ? MF_CHECKED : MF_STRING); -#endif CheckMenuItem(m_handle, ID_NORMAL2X, SCALER_SW_2(scalerOpNormal, 2) ? MF_CHECKED : MF_STRING); CheckMenuItem(m_handle, ID_NORMAL3X, SCALER_SW_2(scalerOpNormal, 3) ? MF_CHECKED : MF_STRING); CheckMenuItem(m_handle, ID_NORMAL4X, SCALER_SW_2(scalerOpNormal, 4) ? MF_CHECKED : MF_STRING); @@ -1702,12 +1697,7 @@ void MSG_Loop(void) { GFX_SetTitle(CPU_CycleMax, -1, -1, false); break; case ID_TOGGLE: ToggleMenu(true); break; -#if defined (xBRZ_w_TBB) - case ID_XBRZ: if (render.xbrz_using) break; SetVal("render", "scaler", !render.scale.forced ? "xbrz" : "xbrz forced"); break; - case ID_NONE: if (((render.scale.op == scalerOpNormal) && (render.scale.size == 1)) && !render.xbrz_using && !render.scale.hardware) break; SetVal("render", "scaler", !render.scale.forced ? "none" : "none forced"); break; -#else case ID_NONE: SCALER_SW(scalerOpNormal, 1) break; SetVal("render", "scaler", !render.scale.forced ? "none" : "none forced"); break; -#endif case ID_NORMAL2X: SCALER_SW(scalerOpNormal, 2) break; SetVal("render", "scaler", !render.scale.forced ? "normal2x" : "normal2x forced"); break; case ID_NORMAL3X: SCALER_SW(scalerOpNormal, 3) break; SetVal("render", "scaler", !render.scale.forced ? "normal3x" : "normal3x forced"); break; case ID_NORMAL4X: SCALER_SW(scalerOpNormal, 4) break; SetVal("render", "scaler", !render.scale.forced ? "normal4x" : "normal4x forced"); break; diff --git a/src/gui/render.cpp b/src/gui/render.cpp index 7e0e8fe24..498d612ca 100644 --- a/src/gui/render.cpp +++ b/src/gui/render.cpp @@ -723,17 +723,7 @@ void RENDER_Init(Section * sec) { render.scale.forced = false; if(f == "forced") render.scale.forced = true; -#if defined (xBRZ_w_TBB) - render.xbrz_using=false; -#endif if (scaler == "none") { render.scale.op = scalerOpNormal; render.scale.size = 1; render.scale.hardware=false; } -#if defined (xBRZ_w_TBB) - else if (scaler == "xbrz") { - render.xbrz_using=true; - render.scale.op = scalerOpNormal;render.scale.size = 1; - LOG_MSG("To enable xBRZ scaler, set output to surface and fullscreen to true."); - } -#endif else if (scaler == "normal2x") { render.scale.op = scalerOpNormal; render.scale.size = 2; render.scale.hardware=false; } else if (scaler == "normal3x") { render.scale.op = scalerOpNormal; render.scale.size = 3; render.scale.hardware=false; } else if (scaler == "normal4x") { render.scale.op = scalerOpNormal; render.scale.size = 4; render.scale.hardware=false; } diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index 277601570..ce614f941 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -44,12 +44,6 @@ #include "support.h" #include "debug.h" #include "render.h" -#if defined (xBRZ_w_TBB) -#include -#include -#include -#include "./xBRZ/xbrz.h" -#endif #include "menu.h" #include "SDL_video.h" @@ -770,9 +764,6 @@ dosurface: ((flags & GFX_CAN_RANDOM) ? SDL_SWSURFACE : SDL_HWSURFACE) | (sdl.desktop.doublebuf ? SDL_DOUBLEBUF|SDL_ASYNCBLIT : 0); if (sdl.desktop.full.fixed -#if defined (xBRZ_w_TBB) - || render.xbrz_using -#endif ) { sdl.clip.x=(Sint16)((sdl.desktop.full.width-width)/2); sdl.clip.y=(Sint16)((sdl.desktop.full.height-height)/2); @@ -1488,32 +1479,11 @@ void GFX_RestoreMode(void) { GFX_UpdateSDLCaptureState(); } - -#if defined (xBRZ_w_TBB) -std::vector renderBuffer; - -bool supportsXBRZ(const SDL_PixelFormat& fmt) { - return fmt.BytesPerPixel == sizeof(uint32_t) && - fmt.Rmask == 0xff0000 && // - fmt.Gmask == 0x00ff00 && //xBRZ scaler needs BGRA byte order - fmt.Bmask == 0x0000ff; // -} -#endif - bool GFX_StartUpdate(Bit8u * & pixels,Bitu & pitch) { if (!sdl.active || sdl.updating) return false; switch (sdl.desktop.type) { case SCREEN_SURFACE: -#if defined (xBRZ_w_TBB) - if (sdl.desktop.fullscreen && render.xbrz_using && supportsXBRZ(*sdl.surface->format)) //let dosbox render into a temporary buffer - { - renderBuffer.resize(sdl.draw.width * sdl.draw.height); - pixels = renderBuffer.empty() ? nullptr : reinterpret_cast(&renderBuffer[0]); - pitch = sdl.draw.width * sizeof(uint32_t); - } - else -#endif if (sdl.blit.surface) { if (SDL_MUSTLOCK(sdl.blit.surface) && SDL_LockSurface(sdl.blit.surface)) return false; @@ -1585,124 +1555,6 @@ void GFX_EndUpdate( const Bit16u *changedLines ) { sdl.updating=false; switch (sdl.desktop.type) { case SCREEN_SURFACE: -#if defined (xBRZ_w_TBB) - if (render.xbrz_using && sdl.desktop.fullscreen && supportsXBRZ(*sdl.surface->format)) - { - const int srcWidth = sdl.draw.width; - const int srcHeight = sdl.draw.height; - if (renderBuffer.size() == srcWidth * srcHeight && - srcWidth > 0 && srcHeight > 0) - { - //we assume renderBuffer is *not* scaled! - //=> set dosbox.conf "scaler=none" and "aspect=false" - - const int outputHeight = sdl.surface->h; //in full screen mode surface == screen - const int outputWidth = sdl.surface->w; // - - //scale to full screen (preserving input aspect) - //aspectOutput = outputWidth / outputHeight; - //aspectInput = srcWidth / srcHeight; - int clipX = 0; - int clipY = 0; - int clipWidth = outputWidth; - int clipHeight = outputHeight; - - if (outputWidth * srcHeight > srcWidth * outputHeight) //output broader than input => black bars left and right - { - clipWidth = outputHeight * srcWidth / srcHeight; - clipX = (outputWidth - clipWidth) / 2; - } - else //black bars top and bottom - { - clipHeight = outputWidth * srcHeight / srcWidth; - clipY = (outputHeight - clipHeight) / 2; - } - - //1. xBRZ-scale renderBuffer into xbrzBuffer - int scalingFactor = (clipWidth + srcWidth / 2) / srcWidth; //=round(clipWidth / srcWidth) - - int xbrzWidth = 0; - int xbrzHeight = 0; - static std::vector xbrzBuffer; - if (scalingFactor >= 2) - { - //if (scalingFactor > 5) - scalingFactor = 2; // scalingFactor = 5; - - xbrzWidth = srcWidth * scalingFactor; - xbrzHeight = srcHeight * scalingFactor; - xbrzBuffer.resize(xbrzWidth * xbrzHeight); - - const uint32_t* renderBuf = &renderBuffer[0]; //help VS compiler a little + support capture by value - uint32_t* xbrzBuf = &xbrzBuffer [0]; - - const size_t TASK_GRANULARITY = 16; //may be as small as somewhere around 10 before slowing down - if (changedLines) //perf: in worst case similar to full input scaling - { - tbb::task_group parallelScale; //perf: task_group + parallel_for is slightly faster than pure prallel_for - - Bitu y = 0, index = 0; - while (y < sdl.draw.height) - { - if (!(index & 1)) - y += changedLines[index]; - else - { - const int yFirst = y; - const int yLast = yFirst + changedLines[index]; - - parallelScale.run([=]{ - tbb::parallel_for(tbb::blocked_range(yFirst, yLast, TASK_GRANULARITY), - [=](const tbb::blocked_range& r) - { - xbrz::scale(scalingFactor, renderBuf, xbrzBuf, srcWidth, srcHeight, xbrz::ScalerCfg(), r.begin(), r.end()); - }); - }); - - y += changedLines[index]; - } - index++; - } - parallelScale.wait(); - } - else //process complete input image - { - tbb::parallel_for(tbb::blocked_range(0, srcHeight, TASK_GRANULARITY), - [=](const tbb::blocked_range& r) - { - xbrz::scale(scalingFactor, renderBuf, xbrzBuf, srcWidth, srcHeight, xbrz::ScalerCfg(), r.begin(), r.end()); - }); - } - } - else //no scaling - { - xbrzWidth = srcWidth; - xbrzHeight = srcHeight; - xbrzBuffer = renderBuffer; - } - - //2. nearest-neighbor-scale xbrzBuffer into output surface clipping area - const bool mustLock = SDL_MUSTLOCK(sdl.surface); - if (mustLock) SDL_LockSurface(sdl.surface); - if (sdl.surface->pixels) //if locking fails, this can be nullptr - { - const size_t TASK_GRANULARITY = 8; - uint32_t* clipTrg = reinterpret_cast(static_cast(sdl.surface->pixels) + clipY * sdl.surface->pitch + clipX * sizeof(uint32_t)); - - tbb::parallel_for(tbb::blocked_range(0, clipHeight, TASK_GRANULARITY), - [&](const tbb::blocked_range& r) - { - xbrz::nearestNeighborScale(&xbrzBuffer[0], xbrzWidth, xbrzHeight, xbrzWidth * sizeof(uint32_t), - clipTrg, clipWidth, clipHeight, sdl.surface->pitch, - xbrz::NN_SCALE_SLICE_TARGET, r.begin(), r.end()); //perf: going over target is by factor 4 faster than going over source for similar image sizes - }); - } - if (mustLock) SDL_UnlockSurface(sdl.surface); - SDL_UpdateRect(sdl.surface, 0, 0, 0, 0); - } - } - else -#endif if (SDL_MUSTLOCK(sdl.surface)) { if (sdl.blit.surface) { SDL_UnlockSurface(sdl.blit.surface); diff --git a/src/platform/Makefile.am b/src/platform/Makefile.am index f240f8f67..6e3b28352 100644 --- a/src/platform/Makefile.am +++ b/src/platform/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = visualc +SUBDIRS = -EXTRA_DIST = sdl-win32.diff \ No newline at end of file +EXTRA_DIST = sdl-win32.diff diff --git a/src/platform/Makefile.in b/src/platform/Makefile.in index 1c1463ea4..987a22f05 100644 --- a/src/platform/Makefile.in +++ b/src/platform/Makefile.in @@ -249,7 +249,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = visualc +SUBDIRS = EXTRA_DIST = sdl-win32.diff all: all-recursive diff --git a/src/platform/visualc/Makefile.am b/src/platform/visualc/Makefile.am deleted file mode 100644 index 4a7bbe82e..000000000 --- a/src/platform/visualc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = unistd.h config.h ntddscsi.h ntddcdrm.h diff --git a/src/platform/visualc/Makefile.in b/src/platform/visualc/Makefile.in deleted file mode 100644 index f2dc854d2..000000000 --- a/src/platform/visualc/Makefile.in +++ /dev/null @@ -1,379 +0,0 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/platform/visualc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ -SDL_LIBS = @SDL_LIBS@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = unistd.h config.h ntddscsi.h ntddcdrm.h -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/platform/visualc/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/platform/visualc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ - ctags-am distclean distclean-generic distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/platform/visualc/config.h b/src/platform/visualc/config.h deleted file mode 100644 index 0f7736240..000000000 --- a/src/platform/visualc/config.h +++ /dev/null @@ -1,95 +0,0 @@ -#define VERSION "SVN-Daum" - -/* Define to 1 to enable internal debugger, requires libcurses */ -#define C_DEBUG 0 - -/* Define to 1 to enable screenshots, requires libpng */ -#define C_SSHOT 1 - -/* Define to 1 to use opengl display output support */ -#define C_OPENGL 1 - -/* Define to 1 to enable internal modem support, requires SDL_net */ -#define C_MODEM 1 - -/* Define to 1 to enable IPX networking support, requires SDL_net */ -#define C_IPX 1 - -/* Enable some heavy debugging options */ -#define C_HEAVY_DEBUG 0 - -/* The type of cpu this host has */ -#define C_TARGETCPU X86 -//#define C_TARGETCPU X86_64 - -/* Define to 1 to use x86 dynamic cpu core */ -#define C_DYNAMIC_X86 1 - -/* Define to 1 to use recompiling cpu core. Can not be used together with the dynamic-x86 core */ -#define C_DYNREC 0 - -/* Enable memory function inlining in */ -#define C_CORE_INLINE 1 - -/* Enable the FPU module, still only for beta testing */ -#define C_FPU 1 - -/* Define to 1 to use a x86 assembly fpu core */ -#define C_FPU_X86 1 - -/* Define to 1 to use a unaligned memory access */ -#define C_UNALIGNED_MEMORY 1 - -/* environ is defined */ -#define ENVIRON_INCLUDED 1 - -/* environ can be linked */ -#define ENVIRON_LINKED 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DDRAW_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_D3D9_H 1 - -/* Define to 1 to use Direct3D shaders, requires d3d9.h and libd3dx9 */ -#define C_D3DSHADERS 1 - -/* Define to 1 if you want serial passthrough support (Win32 only). */ -#define C_DIRECTSERIAL 1 - -/* My defines */ -#define C_LIBPNG 1 -#define C_PRINTER 1 -#define C_NE2000 1 -#define C_DIRECTLPT 1 -#define C_FLUIDSYNTH 1 -#define C_SDL_SOUND 1 -#define __WIN32__ 1 -#define WIN32 1 -#define __SSE__ 1 - -#define GCC_ATTRIBUTE(x) /* attribute not supported */ -#define GCC_UNLIKELY(x) (x) -#define GCC_LIKELY(x) (x) - -#define INLINE __forceinline -#define DB_FASTCALL __fastcall - -#if defined(_MSC_VER) && (_MSC_VER >= 1400) -#pragma warning(disable : 4996) -#endif - -typedef double Real64; -/* The internal types */ -typedef unsigned char Bit8u; -typedef signed char Bit8s; -typedef unsigned short Bit16u; -typedef signed short Bit16s; -typedef unsigned long Bit32u; -typedef signed long Bit32s; -typedef unsigned __int64 Bit64u; -typedef signed __int64 Bit64s; -typedef unsigned int Bitu; -typedef signed int Bits; - diff --git a/src/platform/visualc/ntddcdrm.h b/src/platform/visualc/ntddcdrm.h deleted file mode 100644 index b2e592cad..000000000 --- a/src/platform/visualc/ntddcdrm.h +++ /dev/null @@ -1,320 +0,0 @@ -/* - * ntddcdrm.h - * - * CDROM IOCTL interface. - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __NTDDCDRM_H -#define __NTDDCDRM_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#pragma pack(push,4) - -#define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM - -#define IOCTL_CDROM_CHECK_VERIFY \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_FIND_NEW_DEVICES \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_GET_CONTROL \ - CTL_CODE(IOCTL_CDROM_BASE, 0x000D, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_GET_DRIVE_GEOMETRY \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0013, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_GET_LAST_SESSION \ - CTL_CODE(IOCTL_CDROM_BASE, 0x000E, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_GET_VOLUME \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_PAUSE_AUDIO \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_PLAY_AUDIO_MSF \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_RAW_READ \ - CTL_CODE(IOCTL_CDROM_BASE, 0x000F, METHOD_OUT_DIRECT, FILE_READ_ACCESS) - -#define IOCTL_CDROM_READ_Q_CHANNEL \ - CTL_CODE(IOCTL_CDROM_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_READ_TOC \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_READ_TOC_EX \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0015, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_RESUME_AUDIO \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_SEEK_AUDIO_MSF \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_SET_VOLUME \ - CTL_CODE(IOCTL_CDROM_BASE, 0x000A, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_SIMBAD \ - CTL_CODE(IOCTL_CDROM_BASE, 0x1003, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_CDROM_STOP_AUDIO \ - CTL_CODE(IOCTL_CDROM_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS) - - -#define MAXIMUM_NUMBER_TRACKS 100 -#define MAXIMUM_CDROM_SIZE 804 -#define MINIMUM_CDROM_READ_TOC_EX_SIZE 2 - -typedef struct _TRACK_DATA { - UCHAR Reserved; - UCHAR Control : 4; - UCHAR Adr : 4; - UCHAR TrackNumber; - UCHAR Reserved1; - UCHAR Address[4]; -} TRACK_DATA, *PTRACK_DATA; - -/* CDROM_DISK_DATA.DiskData flags */ -#define CDROM_DISK_AUDIO_TRACK 0x00000001 -#define CDROM_DISK_DATA_TRACK 0x00000002 - -typedef struct _CDROM_DISK_DATA { - ULONG DiskData; -} CDROM_DISK_DATA, *PCDROM_DISK_DATA; - -typedef struct _CDROM_PLAY_AUDIO_MSF { - UCHAR StartingM; - UCHAR StartingS; - UCHAR StartingF; - UCHAR EndingM; - UCHAR EndingS; - UCHAR EndingF; -} CDROM_PLAY_AUDIO_MSF, *PCDROM_PLAY_AUDIO_MSF; - -/* CDROM_READ_TOC_EX.Format constants */ -#define CDROM_READ_TOC_EX_FORMAT_TOC 0x00 -#define CDROM_READ_TOC_EX_FORMAT_SESSION 0x01 -#define CDROM_READ_TOC_EX_FORMAT_FULL_TOC 0x02 -#define CDROM_READ_TOC_EX_FORMAT_PMA 0x03 -#define CDROM_READ_TOC_EX_FORMAT_ATIP 0x04 -#define CDROM_READ_TOC_EX_FORMAT_CDTEXT 0x05 - -typedef struct _CDROM_READ_TOC_EX { - UCHAR Format : 4; - UCHAR Reserved1 : 3; - UCHAR Msf : 1; - UCHAR SessionTrack; - UCHAR Reserved2; - UCHAR Reserved3; -} CDROM_READ_TOC_EX, *PCDROM_READ_TOC_EX; - -typedef struct _CDROM_SEEK_AUDIO_MSF { - UCHAR M; - UCHAR S; - UCHAR F; -} CDROM_SEEK_AUDIO_MSF, *PCDROM_SEEK_AUDIO_MSF; - -/* CDROM_SUB_Q_DATA_FORMAT.Format constants */ -#define IOCTL_CDROM_SUB_Q_CHANNEL 0x00 -#define IOCTL_CDROM_CURRENT_POSITION 0x01 -#define IOCTL_CDROM_MEDIA_CATALOG 0x02 -#define IOCTL_CDROM_TRACK_ISRC 0x03 - -typedef struct _CDROM_SUB_Q_DATA_FORMAT { - UCHAR Format; - UCHAR Track; -} CDROM_SUB_Q_DATA_FORMAT, *PCDROM_SUB_Q_DATA_FORMAT; - -typedef struct _CDROM_TOC { - UCHAR Length[2]; - UCHAR FirstTrack; - UCHAR LastTrack; - TRACK_DATA TrackData[MAXIMUM_NUMBER_TRACKS]; -} CDROM_TOC, *PCDROM_TOC; - -#define CDROM_TOC_SIZE sizeof(CDROM_TOC) - -typedef struct _CDROM_TOC_ATIP_DATA_BLOCK { - UCHAR CdrwReferenceSpeed : 3; - UCHAR Reserved3 : 1; - UCHAR WritePower : 3; - UCHAR True1 : 1; - UCHAR Reserved4 : 6; - UCHAR UnrestrictedUse : 1; - UCHAR Reserved5 : 1; - UCHAR A3Valid : 1; - UCHAR A2Valid : 1; - UCHAR A1Valid : 1; - UCHAR Reserved6 : 3; - UCHAR IsCdrw : 1; - UCHAR True2 : 1; - UCHAR Reserved7; - UCHAR LeadInMsf[3]; - UCHAR Reserved8; - UCHAR LeadOutMsf[3]; - UCHAR Reserved9; - UCHAR A1Values[3]; - UCHAR Reserved10; - UCHAR A2Values[3]; - UCHAR Reserved11; - UCHAR A3Values[3]; - UCHAR Reserved12; -} CDROM_TOC_ATIP_DATA_BLOCK, *PCDROM_TOC_ATIP_DATA_BLOCK; - -/* CDROM_TOC_CD_TEXT_DATA_BLOCK.PackType constants */ -#define CDROM_CD_TEXT_PACK_ALBUM_NAME 0x80 -#define CDROM_CD_TEXT_PACK_PERFORMER 0x81 -#define CDROM_CD_TEXT_PACK_SONGWRITER 0x82 -#define CDROM_CD_TEXT_PACK_COMPOSER 0x83 -#define CDROM_CD_TEXT_PACK_ARRANGER 0x84 -#define CDROM_CD_TEXT_PACK_MESSAGES 0x85 -#define CDROM_CD_TEXT_PACK_DISC_ID 0x86 -#define CDROM_CD_TEXT_PACK_GENRE 0x87 -#define CDROM_CD_TEXT_PACK_TOC_INFO 0x88 -#define CDROM_CD_TEXT_PACK_TOC_INFO2 0x89 -#define CDROM_CD_TEXT_PACK_UPC_EAN 0x8e -#define CDROM_CD_TEXT_PACK_SIZE_INFO 0x8f - -typedef struct _CDROM_TOC_CD_TEXT_DATA_BLOCK { - UCHAR PackType; - UCHAR TrackNumber : 7; - UCHAR ExtensionFlag : 1; - UCHAR SequenceNumber; - UCHAR CharacterPosition : 4; - UCHAR BlockNumber : 3; - UCHAR Unicode : 1; - union { - UCHAR Text[12]; - WCHAR WText[6]; - }; - UCHAR CRC[2]; -} CDROM_TOC_CD_TEXT_DATA_BLOCK, *PCDROM_TOC_CD_TEXT_DATA_BLOCK; - -/* CDROM_TOC_FULL_TOC_DATA_BLOCK.Adr constants */ -#define ADR_NO_MODE_INFORMATION 0x0 -#define ADR_ENCODES_CURRENT_POSITION 0x1 -#define ADR_ENCODES_MEDIA_CATALOG 0x2 -#define ADR_ENCODES_ISRC 0x3 - -typedef struct _CDROM_TOC_FULL_TOC_DATA_BLOCK { - UCHAR SessionNumber; - UCHAR Control : 4; - UCHAR Adr : 4; - UCHAR Reserved1; - UCHAR Point; - UCHAR MsfExtra[3]; - UCHAR Zero; - UCHAR Msf[3]; -} CDROM_TOC_FULL_TOC_DATA_BLOCK, *PCDROM_TOC_FULL_TOC_DATA_BLOCK; - -/* SUB_Q_HEADER.AudioStatus constants */ -#define AUDIO_STATUS_NOT_SUPPORTED 0x00 -#define AUDIO_STATUS_IN_PROGRESS 0x11 -#define AUDIO_STATUS_PAUSED 0x12 -#define AUDIO_STATUS_PLAY_COMPLETE 0x13 -#define AUDIO_STATUS_PLAY_ERROR 0x14 -#define AUDIO_STATUS_NO_STATUS 0x15 - -typedef struct _SUB_Q_HEADER { - UCHAR Reserved; - UCHAR AudioStatus; - UCHAR DataLength[2]; -} SUB_Q_HEADER, *PSUB_Q_HEADER; - -typedef struct _SUB_Q_MEDIA_CATALOG_NUMBER { - SUB_Q_HEADER Header; - UCHAR FormatCode; - UCHAR Reserved[3]; - UCHAR Reserved1 : 7; - UCHAR Mcval :1; - UCHAR MediaCatalog[15]; -} SUB_Q_MEDIA_CATALOG_NUMBER, *PSUB_Q_MEDIA_CATALOG_NUMBER; - -typedef struct _SUB_Q_TRACK_ISRC { - SUB_Q_HEADER Header; - UCHAR FormatCode; - UCHAR Reserved0; - UCHAR Track; - UCHAR Reserved1; - UCHAR Reserved2 : 7; - UCHAR Tcval : 1; - UCHAR TrackIsrc[15]; -} SUB_Q_TRACK_ISRC, *PSUB_Q_TRACK_ISRC; - -typedef struct _SUB_Q_CURRENT_POSITION { - SUB_Q_HEADER Header; - UCHAR FormatCode; - UCHAR Control : 4; - UCHAR ADR : 4; - UCHAR TrackNumber; - UCHAR IndexNumber; - UCHAR AbsoluteAddress[4]; - UCHAR TrackRelativeAddress[4]; -} SUB_Q_CURRENT_POSITION, *PSUB_Q_CURRENT_POSITION; - -typedef union _SUB_Q_CHANNEL_DATA { - SUB_Q_CURRENT_POSITION CurrentPosition; - SUB_Q_MEDIA_CATALOG_NUMBER MediaCatalog; - SUB_Q_TRACK_ISRC TrackIsrc; -} SUB_Q_CHANNEL_DATA, *PSUB_Q_CHANNEL_DATA; - -/* CDROM_AUDIO_CONTROL.LbaFormat constants */ -#define AUDIO_WITH_PREEMPHASIS 0x1 -#define DIGITAL_COPY_PERMITTED 0x2 -#define AUDIO_DATA_TRACK 0x4 -#define TWO_FOUR_CHANNEL_AUDIO 0x8 - -typedef struct _CDROM_AUDIO_CONTROL { - UCHAR LbaFormat; - USHORT LogicalBlocksPerSecond; -} CDROM_AUDIO_CONTROL, *PCDROM_AUDIO_CONTROL; - -typedef struct _VOLUME_CONTROL { - UCHAR PortVolume[4]; -} VOLUME_CONTROL, *PVOLUME_CONTROL; - -typedef enum _TRACK_MODE_TYPE { - YellowMode2, - XAForm2, - CDDA -} TRACK_MODE_TYPE, *PTRACK_MODE_TYPE; - -typedef struct __RAW_READ_INFO { - LARGE_INTEGER DiskOffset; - ULONG SectorCount; - TRACK_MODE_TYPE TrackMode; -} RAW_READ_INFO, *PRAW_READ_INFO; - -#pragma pack(pop) - -#ifdef __cplusplus -} -#endif - -#endif /* __NTDDCDRM_H */ diff --git a/src/platform/visualc/ntddscsi.h b/src/platform/visualc/ntddscsi.h deleted file mode 100644 index 387862c2c..000000000 --- a/src/platform/visualc/ntddscsi.h +++ /dev/null @@ -1,174 +0,0 @@ -/* - * ntddscsi.h - * - * SCSI port IOCTL interface. - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __NTDDSCSI_H -#define __NTDDSCSI_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#pragma pack(push,4) - -//#include "ntddk.h" - -#define DD_SCSI_DEVICE_NAME "\\Device\\ScsiPort" -#define DD_SCSI_DEVICE_NAME_U L"\\Device\\ScsiPort" - -#define IOCTL_SCSI_BASE FILE_DEVICE_CONTROLLER - -#define IOCTL_SCSI_GET_INQUIRY_DATA \ - CTL_CODE(IOCTL_SCSI_BASE, 0x0403, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_SCSI_GET_CAPABILITIES \ - CTL_CODE(IOCTL_SCSI_BASE, 0x0404, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_SCSI_GET_ADDRESS \ - CTL_CODE(IOCTL_SCSI_BASE, 0x0406, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_SCSI_MINIPORT \ - CTL_CODE(IOCTL_SCSI_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_SCSI_PASS_THROUGH \ - CTL_CODE(IOCTL_SCSI_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_SCSI_PASS_THROUGH_DIRECT \ - CTL_CODE(IOCTL_SCSI_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_SCSI_RESCAN_BUS \ - CTL_CODE(IOCTL_SCSI_BASE, 0x0407, METHOD_BUFFERED, FILE_ANY_ACCESS) - - -DEFINE_GUID(ScsiRawInterfaceGuid, 0x53f56309L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); - -DEFINE_GUID(WmiScsiAddressGuid, 0x53f5630fL, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); - -typedef struct _SCSI_PASS_THROUGH { - USHORT Length; - UCHAR ScsiStatus; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR CdbLength; - UCHAR SenseInfoLength; - UCHAR DataIn; - ULONG DataTransferLength; - ULONG TimeOutValue; - ULONG_PTR DataBufferOffset; - ULONG SenseInfoOffset; - UCHAR Cdb[16]; -} SCSI_PASS_THROUGH, *PSCSI_PASS_THROUGH; - -typedef struct _SCSI_PASS_THROUGH_DIRECT { - USHORT Length; - UCHAR ScsiStatus; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR CdbLength; - UCHAR SenseInfoLength; - UCHAR DataIn; - ULONG DataTransferLength; - ULONG TimeOutValue; - PVOID DataBuffer; - ULONG SenseInfoOffset; - UCHAR Cdb[16]; -} SCSI_PASS_THROUGH_DIRECT, *PSCSI_PASS_THROUGH_DIRECT; - -typedef struct _SRB_IO_CONTROL { - ULONG HeaderLength; - UCHAR Signature[8]; - ULONG Timeout; - ULONG ControlCode; - ULONG ReturnCode; - ULONG Length; -} SRB_IO_CONTROL, *PSRB_IO_CONTROL; - -typedef struct _SCSI_ADDRESS { - ULONG Length; - UCHAR PortNumber; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; -} SCSI_ADDRESS, *PSCSI_ADDRESS; - -typedef struct _SCSI_BUS_DATA { - UCHAR NumberOfLogicalUnits; - UCHAR InitiatorBusId; - ULONG InquiryDataOffset; -}SCSI_BUS_DATA, *PSCSI_BUS_DATA; - -typedef struct _SCSI_ADAPTER_BUS_INFO { - UCHAR NumberOfBuses; - SCSI_BUS_DATA BusData[1]; -} SCSI_ADAPTER_BUS_INFO, *PSCSI_ADAPTER_BUS_INFO; - -typedef struct _IO_SCSI_CAPABILITIES { - ULONG Length; - ULONG MaximumTransferLength; - ULONG MaximumPhysicalPages; - ULONG SupportedAsynchronousEvents; - ULONG AlignmentMask; - BOOLEAN TaggedQueuing; - BOOLEAN AdapterScansDown; - BOOLEAN AdapterUsesPio; -} IO_SCSI_CAPABILITIES, *PIO_SCSI_CAPABILITIES; - -typedef struct _SCSI_INQUIRY_DATA { - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - BOOLEAN DeviceClaimed; - ULONG InquiryDataLength; - ULONG NextInquiryDataOffset; - UCHAR InquiryData[1]; -} SCSI_INQUIRY_DATA, *PSCSI_INQUIRY_DATA; - -#define SCSI_IOCTL_DATA_OUT 0 -#define SCSI_IOCTL_DATA_IN 1 -#define SCSI_IOCTL_DATA_UNSPECIFIED 2 - -/* -typedef struct _DUMP_POINTERS { - PADAPTER_OBJECT AdapterObject; - PVOID MappedRegisterBase; - PVOID DumpData; - PVOID CommonBufferVa; - LARGE_INTEGER CommonBufferPa; - ULONG CommonBufferSize; - BOOLEAN AllocateCommonBuffers; - BOOLEAN UseDiskDump; - UCHAR Spare1[2]; - PVOID DeviceObject; -} DUMP_POINTERS, *PDUMP_POINTERS; -*/ -#pragma pack(pop) - -#ifdef __cplusplus -} -#endif - -#endif /* __NTDDSCSI_H */ diff --git a/src/platform/visualc/stdint.h b/src/platform/visualc/stdint.h deleted file mode 100644 index 5ee628cd6..000000000 --- a/src/platform/visualc/stdint.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifdef WIN32 -# ifndef __STDINT_H -# define __STDINT_H -# endif - -typedef signed char int8_t; -typedef unsigned char uint8_t; - -typedef signed short int16_t; -typedef unsigned short uint16_t; - -typedef signed int int32_t; -typedef unsigned int uint32_t; - -typedef signed __int64 int64_t; -typedef unsigned __int64 uint64_t; - -#endif diff --git a/src/platform/visualc/unistd.h b/src/platform/visualc/unistd.h deleted file mode 100644 index 65ce3894a..000000000 --- a/src/platform/visualc/unistd.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * This file is part of the Mingw32 package. - * - * unistd.h maps (roughly) to io.h - */ - -#ifndef __STRICT_ANSI__ -#include -#endif - diff --git a/visualc_net/Makefile.am b/visualc_net/Makefile.am deleted file mode 100644 index 6d1c6dd61..000000000 --- a/visualc_net/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = dosbox.sln dosbox.vcproj \ No newline at end of file diff --git a/visualc_net/Makefile.in b/visualc_net/Makefile.in deleted file mode 100644 index 0781a3a96..000000000 --- a/visualc_net/Makefile.in +++ /dev/null @@ -1,379 +0,0 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2012 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = visualc_net -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALSA_CFLAGS = @ALSA_CFLAGS@ -ALSA_LIBS = @ALSA_LIBS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FREETYPE_CONFIG = @FREETYPE_CONFIG@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SDL_CFLAGS = @SDL_CFLAGS@ -SDL_CONFIG = @SDL_CONFIG@ -SDL_LIBS = @SDL_LIBS@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINDRES = @WINDRES@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -EXTRA_DIST = dosbox.sln dosbox.vcproj -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu visualc_net/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu visualc_net/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ - ctags-am distclean distclean-generic distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/visualc_net/dosbox.sln b/visualc_net/dosbox.sln deleted file mode 100644 index 13b31af91..000000000 --- a/visualc_net/dosbox.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.20617.1 PREVIEW -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dosbox", "dosbox.vcxproj", "{7FCFFB9B-8629-4D51-849C-8490CECF8AB7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7FCFFB9B-8629-4D51-849C-8490CECF8AB7}.Debug|Win32.ActiveCfg = Debug|Win32 - {7FCFFB9B-8629-4D51-849C-8490CECF8AB7}.Debug|Win32.Build.0 = Debug|Win32 - {7FCFFB9B-8629-4D51-849C-8490CECF8AB7}.Release|Win32.ActiveCfg = Release|Win32 - {7FCFFB9B-8629-4D51-849C-8490CECF8AB7}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/visualc_net/dosbox.v12.suo b/visualc_net/dosbox.v12.suo deleted file mode 100644 index 5de309279b0d235102ec4a78b0eade53a871071c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10752 zcmeHN+iw(A96l=o1&dlQsCZ#TM3Ax;+H!3%?Y0dBn$~t(cpzz}vuBr~)0t*2rHvYW zAjTMDjIZj0A-*+ufa6wgHKp&2Q$+nRCwXemT?r zaHHdwudeO*RaCW;VuQG~vPEo)jc3q*NIgF;#3Sf)?AFT43WqlU(0$PEBMJNiTB*MW z?f)r(31Q>siL4kF7VeH%rYomz+r`ETpHH(;#fvm^)69u$F3tS)o^wCrUr+sSNfPYW z)8Bmg;q^>A=6&~AIC&fvXNybXG_0?L-mq9o+NI+CcJWZAS^1yD4oF`?D+o=vVosbD z2JW7i!c~GMHSR|9>fLq&|HF96Tu3_V&5Mus%II$%?>BM;048*x|rkw)rtD}X*r*oOY20IH8N z>;OCgcoOg+k0@#0KX>JSQs}V$p}@WjSRk#=fliZJ78T(Om_)lF*GcpFJ|6$4Vb29v zzb#BLi|dk@3@|Uk_I31<+Ai4tQ<(H3AT9nAm`i(SD+C;SBJPLuJQLowjB6MbhVbM8 z&R}+Bex(1!wH@x-_}YutJ_~2G+W04g4-HTf9)64vWyom+JriSbD*Aw*eyC^&Hchzf z!}}kjLY^9*1-5b&bf$2CDgl;3q4LNon=}8s;7cuvOz{{-ND11ah~5zp)hd0RMB?ry2hDV7`j~)%dAn=7ULa z??VyNsB-3|JD4DLiY2($~rXe zll8RF8R2LCNsIqk%q>JLRpYO1e{o8ph0(1C_?iFI*|+j-?I+4g>0iZP+T8+VP0ks4 zCt-h#IY|+a^#}Rhi9OTu&syQPyBVavG>;nI^=jQ>Wp&{bv<#yav{WpZ2>)}_m zpo;#r_Rax6Ya-S`Y4OMTr=OePU-1~qxde{Of&bG6Lhfr}7XtR*wEP(>tjPbz;NzE2 zd6uE=Y8_9DqqUL7Mwx%cxO})*B|IF%noLrQsyx zK8m1K{s$p>9oe4t$Bf6^cQ(>TBfnGnxD)<)zBw3eP}~3b9fW>4mRJYC|C^RSYvtK1%2Y5kA6axvO`EQo!q zv#kKivCKDwk)$&S{9incy?7o?i=VNFHo!IrJ=?H9O4-3ZZQc!63!HtLmp|pTH`+jb zXHefCCQ*5_2JnKc)VTKL7UZ9Ns}^mWcvJRATTs9=k?Ql#InA8^S<_P&@jX}@^O^aX z=R}^EX`X?lm6dLa)=%O&4^N3$BfJr!Tb9xSntc@HVtQf_OH9 z-yk$U2x~bi4#Pfw|iaa4+raxiUF)TBHk7KVgebEr)^dzQoIvY zrrm+Hty0Wdsudm(i?)i-|GM$sz7O6Sz4FDCPp{wj=v%d+3R0`+*7WF8(cj@RqMhFn z-RL`t!1vUUHg0z+4>!1gm#fFh3kbseyy1gI6X9kCA($T=E+7T3Zj-|-Jvf|%#{q6u zfoCeha*8UC{|?-KYTS#jVgIf+*6pJZff>}F1_F&d}(sn|;xz0Q08hBL>_R4CIneQTcCL|M=0l%8B zCwIBnx1YFoC(*%pIRF}YE?b1dsxBvfQ7W$sGX5RjvBgSyLQRTO&hMSnUkJhH0)eKy52d%D%zJjv(wUX4cqEJcqrG! zUuQP&o1X8;eoOkEqnVxAaevk{^fPj~V9!abf3~Z;)LS}II(V?y+og4D?M%uGiKud? zEl)ZnO_%O^VBJVg`;xKdZOe0P)09qb!nY=+=NVSn9nw6Fv2J(YX?MghWi&pZd&Z(X zIX5#isOfWFK zgBOl&+rV17sdf+TKd{7O$>NS#B1F7wLU%MnGQ1yVIAEHzF;~5tl%~`@xyID)swr*C z1QrlPl`W*SgBR9b+qO2XBdn^|T0Ou0nNR$$mwKp!@vG;5I=6V@`#-K-{k{F>ZwL5! I - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/visualc_net/dosbox.vcxproj b/visualc_net/dosbox.vcxproj deleted file mode 100644 index 1ec7cd106..000000000 --- a/visualc_net/dosbox.vcxproj +++ /dev/null @@ -1,556 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - {7FCFFB9B-8629-4D51-849C-8490CECF8AB7} - - - - Application - v120 - false - MultiByte - - - Application - v120 - false - MultiByte - - - - - - - - - - - - - <_ProjectFileVersion>12.0.20617.1 - - - .\Debug\ - .\Debug\ - false - false - - - .\Release\ - .\Release\ - false - false - - - - Disabled - ../include;../src/platform/visualc;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - .\Debug/dosbox.pch - .\Debug/ - .\Debug/ - .\Debug/ - true - Level3 - true - EditAndContinue - Default - - - tbb.lib;dinput8.lib;dxguid.lib;gthread-2.0.lib;glib.lib;dsound.lib;opengl32.lib;sdl_net.lib;winmm.lib;zlib.lib;libpng.lib;sdlmain.lib;sdl.lib;pdcurses.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libfluidsynth-1.lib;libfreetype-6.lib;libphysfs.lib;SDL_sound.lib;wpcap.lib;%(AdditionalDependencies) - .\Debug/dosbox.exe - true - false - .\Debug/dosbox.pdb - Console - MachineX86 - - - .\Debug/dosbox.tlb - - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - Full - AnySuitable - true - Size - true - ../include;../src/platform/visualc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - .\Release/dosbox.pch - AssemblyAndSourceCode - .\Release/ - .\Release/ - .\Release/ - true - Level3 - true - ProgramDatabase - Default - false - StreamingSIMDExtensions2 - None - true - Fast - - - tbb.lib;dinput8.lib;dxguid.lib;gthread-2.0.lib;glib.lib;dsound.lib;opengl32.lib;sdl_net.lib;winmm.lib;zlib.lib;libpng.lib;sdlmain.lib;sdl.lib;pdcurses.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libfluidsynth-1.lib;libfreetype-6.lib;libphysfs.lib;SDL_sound.lib;wpcap.lib;%(AdditionalDependencies) - .\Release/dosbox.exe - true - false - - false - Console - MachineX86 - false - UseLinkTimeCodeGeneration - NoErrorReport - true - true - - - .\Release/dosbox.tlb - - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/visualc_net/dosbox.vcxproj.filters b/visualc_net/dosbox.vcxproj.filters deleted file mode 100644 index 1ea2a94be..000000000 --- a/visualc_net/dosbox.vcxproj.filters +++ /dev/null @@ -1,712 +0,0 @@ - - - - - {089ea85e-9530-4277-b5da-01aad3337994} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {a0bb5646-24fa-4ef9-8cb9-fe06afb5f495} - - - {cadd4ea7-089c-423e-b6a0-0136e6d8a571} - - - {8ff7b4d6-516c-44d0-b93d-31dab96d212b} - - - {b115eb52-aa6a-422a-b100-ee405ae0102e} - - - {595f6f8a-c76f-4a05-b2b3-9db725f28ef9} - - - {fcaf61ca-1b3a-4199-9b48-eeade7ddd9be} - - - {553ac767-5df3-4b1a-9518-4f69eda52807} - - - {bf99e3d1-74ca-4248-a0b6-6a759520dd29} - - - {c5fadbf2-5ddb-4794-ab70-c2697c3abe9b} - - - {17326b9d-cb92-4e26-848b-b992b51d6536} - - - {b21790aa-a2a0-4c1e-8bc0-15cdfa131fb7} - - - {beddf647-b98f-4e2a-ac1a-a4d1499a37e2} - - - {7bdfbb2f-4003-48b4-be60-866786b8ef99} - - - {1ee1e47f-c523-4dfc-b087-d2f705b00b78} - - - {2d57a4e9-26fd-494f-976f-7c39e74f2075} - - - {5544b625-f274-46bb-b4d3-a31b6e7a488e} - - - {b2315365-d8a4-49de-81b8-c91f145ab91c} - - - {ec6e9a9f-6ca1-4877-8715-96f80afcc54b} - - - {8316590d-5c5b-4f55-ba4f-ae1792c60192} - - - {83076ff5-1a80-453a-b7f3-ea92da3f8432} - - - {5dcc42b0-5c14-40f0-ba3b-d7e18fdaa272} - - - {406e3a7d-7df5-45c2-89de-6b26c5e4a485} - h;hpp;hxx;hm;inl - - - - - Source Files - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\debug - - - Source Files\debug - - - Source Files\debug - - - Source Files\debug - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos - - - Source Files\dos\cdrom - - - Source Files\dos\cdrom - - - Source Files\dos\cdrom - - - Source Files\dos\cdrom - - - Source Files\dos\drives - - - Source Files\dos\drives - - - Source Files\dos\drives - - - Source Files\dos\drives - - - Source Files\dos\drives - - - Source Files\dos\drives - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\vga - - - Source Files\hardware\sound - - - Source Files\hardware\sound - - - Source Files\hardware\sound - - - Source Files\hardware\sound - - - Source Files\hardware\sound - - - Source Files\hardware\sound - - - Source Files\hardware\sound - - - Source Files\hardware\sound - - - Source Files\hardware\sound - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\ints - - - Source Files\ints - - - Source Files\ints - - - Source Files\ints - - - Source Files\ints - - - Source Files\ints - - - Source Files\ints\int10 - - - Source Files\ints\int10 - - - Source Files\ints\int10 - - - Source Files\ints\int10 - - - Source Files\ints\int10 - - - Source Files\ints\int10 - - - Source Files\ints\int10 - - - Source Files\ints\int10 - - - Source Files\ints\int10 - - - Source Files\ints\int10 - - - Source Files\shell - - - Source Files\shell - - - Source Files\shell - - - Source Files\shell - - - Source Files\misc - - - Source Files\misc - - - Source Files\misc - - - Source Files\misc - - - Source Files\misc - - - Source Files\fpu - - - - - Source Files - - - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu - - - Source Files\cpu\core_normal - - - Source Files\cpu\core_normal - - - Source Files\cpu\core_normal - - - Source Files\cpu\core_normal - - - Source Files\cpu\core_normal - - - Source Files\cpu\core_normal - - - Source Files\cpu\core_normal - - - Source Files\cpu\core_normal - - - Source Files\cpu\core_full - - - Source Files\cpu\core_full - - - Source Files\cpu\core_full - - - Source Files\cpu\core_full - - - Source Files\cpu\core_full - - - Source Files\cpu\core_full - - - Source Files\cpu\core_full - - - Source Files\cpu\core_full - - - Source Files\cpu\core_dyn_x86 - - - Source Files\cpu\core_dyn_x86 - - - Source Files\cpu\core_dyn_x86 - - - Source Files\cpu\core_dyn_x86 - - - Source Files\cpu\core_dyn_x86 - - - Source Files\cpu\core_dyn_x86 - - - Source Files\cpu\core_dyn_x86 - - - Source Files\cpu\core_dynrec - - - Source Files\cpu\core_dynrec - - - Source Files\cpu\core_dynrec - - - Source Files\cpu\core_dynrec - - - Source Files\cpu\core_dynrec - - - Source Files\cpu\core_dynrec - - - Source Files\cpu\core_dynrec - - - Source Files\cpu\core_dynrec - - - Source Files\debug - - - Source Files\debug - - - Source Files\dos - - - Source Files\dos\win32headers - - - Source Files\dos\win32headers - - - Source Files\dos\win32headers - - - Source Files\dos\win32headers - - - Source Files\dos\win32headers - - - Source Files\dos\win32headers - - - Source Files\dos\cdrom - - - Source Files\hardware - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\hardware\serialport - - - Source Files\gui - - - Source Files\gui - - - Source Files\gui - - - Source Files\ints - - - Source Files\ints\int10 - - - Source Files\visualc - - - Source Files\visualc - - - Source Files\fpu - - - Source Files\fpu - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - - \ No newline at end of file