Move all include files to src/include

- 86Box's own headers go to /86box
- munt's public interface goes to /mt32emu
- all slirp headers go to /slirp (might want to consider using only its public inteface)
- single file headers from other projects go in include root
This commit is contained in:
David Hrdlička
2020-03-29 14:24:42 +02:00
parent ef84f51bb1
commit a505894a10
508 changed files with 8394 additions and 3820 deletions

View File

@@ -52,12 +52,12 @@
#include <errno.h>
#define PNG_DEBUG 0
#include <png.h>
#include "86box.h"
#include "plat.h"
#include "plat_dynld.h"
#include "ui.h"
#include "video.h"
#include "png_struct.h"
#include <86box/86box.h>
#include <86box/plat.h>
#include <86box/plat_dynld.h>
#include <86box/ui.h>
#include <86box/video.h>
#include <86box/png_struct.h>
#ifdef _WIN32
# define PATH_PNG_DLL "libpng16-16.dll"

View File

@@ -1,66 +0,0 @@
/*
* VARCem Virtual ARchaeological Computer EMulator.
* An emulator of (mostly) x86-based PC systems and devices,
* using the ISA,EISA,VLB,MCA and PCI system buses, roughly
* spanning the era between 1981 and 1995.
*
* This file is part of the VARCem Project.
*
* Definitions for the centralized PNG image handler.
*
*
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2018 Fred N. van Kempen.
*
* Redistribution and use in source and binary forms, with
* or without modification, are permitted provided that the
* following conditions are met:
*
* 1. Redistributions of source code must retain the entire
* above notice, this list of conditions and the following
* disclaimer.
*
* 2. Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the
* following disclaimer in the documentation and/or other
* materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names
* of its contributors may be used to endorse or promote
* products derived from this software without specific
* prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef EMU_PNG_STRUCT_H
# define EMU_PNG_STRUCT_H
#ifdef __cplusplus
extern "C" {
#endif
extern int png_write_gray(wchar_t *path, int invert,
uint8_t *pix, int16_t w, int16_t h);
extern void png_write_rgb(wchar_t *fn,
uint8_t *pix, int16_t w, int16_t h, uint16_t pitch, PALETTE palcol);
#ifdef __cplusplus
}
#endif
#endif /*EMU_PNG_STRUCT_H*/

View File

@@ -1,65 +0,0 @@
/*
* VARCem Virtual ARchaeological Computer EMulator.
* An emulator of (mostly) x86-based PC systems and devices,
* using the ISA,EISA,VLB,MCA and PCI system buses, roughly
* spanning the era between 1981 and 1995.
*
* This file is part of the VARCem Project.
*
* Definitions for the printers module.
*
*
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2018 Fred N. van Kempen.
*
* Redistribution and use in source and binary forms, with
* or without modification, are permitted provided that the
* following conditions are met:
*
* 1. Redistributions of source code must retain the entire
* above notice, this list of conditions and the following
* disclaimer.
*
* 2. Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the
* following disclaimer in the documentation and/or other
* materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names
* of its contributors may be used to endorse or promote
* products derived from this software without specific
* prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef PRINTER_H
# define PRINTER_H
#define FONT_FILE_DOTMATRIX L"dotmatrix.ttf"
#define FONT_FILE_ROMAN L"roman.ttf"
#define FONT_FILE_SANSSERIF L"sansserif.ttf"
#define FONT_FILE_COURIER L"courier.ttf"
#define FONT_FILE_SCRIPT L"script.ttf"
#define FONT_FILE_OCRA L"ocra.ttf"
#define FONT_FILE_OCRB L"ocra.ttf"
extern void
select_codepage(uint16_t code, uint16_t *curmap);
#endif /*PRINTER_H*/

View File

@@ -53,9 +53,9 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "86box.h"
#include "plat.h"
#include "printer.h"
#include <86box/86box.h>
#include <86box/plat.h>
#include <86box/printer.h>
static const uint16_t cp437Map[256] = {

View File

@@ -1,3 +0,0 @@
extern const lpt_device_t lpt_prt_text_device;
extern const lpt_device_t lpt_prt_escp_device;
extern const lpt_device_t lpt_prt_ps_device;

View File

@@ -56,21 +56,21 @@
#include <math.h>
#include <ft2build.h>
#include FT_FREETYPE_H
#include "86box.h"
#include <86box/86box.h>
#include "cpu.h"
#include "machine.h"
#include "timer.h"
#include "mem.h"
#include "rom.h"
#include "pit.h"
#include "plat.h"
#include "plat_dynld.h"
#include "ui.h"
#include "lpt.h"
#include "video.h"
#include "png_struct.h"
#include "printer.h"
#include "prt_devs.h"
#include <86box/machine.h>
#include <86box/timer.h>
#include <86box/mem.h>
#include <86box/rom.h>
#include <86box/pit.h>
#include <86box/plat.h>
#include <86box/plat_dynld.h>
#include <86box/ui.h>
#include <86box/lpt.h>
#include <86box/video.h>
#include <86box/png_struct.h>
#include <86box/printer.h>
#include <86box/prt_devs.h>
/* Default page values (for now.) */

View File

@@ -22,15 +22,15 @@
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
#include "86box.h"
#include "language.h"
#include "lpt.h"
#include "timer.h"
#include "pit.h"
#include "plat.h"
#include "plat_dynld.h"
#include "ui.h"
#include "prt_devs.h"
#include <86box/86box.h>
#include <86box/language.h>
#include <86box/lpt.h>
#include <86box/timer.h>
#include <86box/pit.h>
#include <86box/plat.h>
#include <86box/plat_dynld.h>
#include <86box/ui.h>
#include <86box/prt_devs.h>
#if defined(_WIN32) && !defined(__WINDOWS__)
#define __WINDOWS__

View File

@@ -56,14 +56,14 @@
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "86box.h"
#include "device.h"
#include "timer.h"
#include "pit.h"
#include "plat.h"
#include "lpt.h"
#include "printer.h"
#include "prt_devs.h"
#include <86box/86box.h>
#include <86box/device.h>
#include <86box/timer.h>
#include <86box/pit.h>
#include <86box/plat.h>
#include <86box/lpt.h>
#include <86box/printer.h>
#include <86box/prt_devs.h>
#define FULL_PAGE 1 /* set if no top/bot margins */