Merge pull request #1327 from SeanRamey/master

Basically, renames pc.c to 86box.c for easier merging with my linux branch later.

src/CMakeLists.txt

@@ -14,7 +14,7 @@
 #
 
 # WIN32 marks us as a GUI app on Windows
-add_executable(86Box WIN32 pc.c config.c random.c timer.c io.c acpi.c apm.c
+add_executable(86Box WIN32 86box.c config.c random.c timer.c io.c acpi.c apm.c
 	dma.c ddma.c nmi.c pic.c pit.c port_92.c ppi.c pci.c mca.c usb.c
 	device.c nvr.c nvr_at.c nvr_ps2.c)
 

src/include/86box/plat.h

@@ -64,7 +64,7 @@ extern "C" {
 /* Global variables residing in the platform module. */
 extern int	dopause,			/* system is paused */
 		doresize,			/* screen resize requested */
-		quited,				/* system exit requested */
+		is_quit,				/* system exit requested */
 		mouse_capture;			/* mouse is captured in app */
 
 #ifdef MTR_ENABLED

src/win/CMakeLists.txt

@@ -38,7 +38,7 @@ else()
 endif()
 
 if(DISCORD)
-	# PUBLIC due to config.c and pc.c
+	# PUBLIC due to config.c and 86box.c
 	target_compile_definitions(ui PUBLIC USE_DISCORD)
 
 	target_sources(ui PRIVATE win_discord.c)

src/win/Makefile.mingw

@@ -609,7 +609,7 @@ CXXFLAGS	:= $(CFLAGS)
 #########################################################################
 #		Create the (final) list of objects to build.		#
 #########################################################################
-MAINOBJ		:= pc.o config.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \
+MAINOBJ		:= 86box.o config.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \
 		   nmi.o pic.o pit.o port_92.o ppi.o pci.o mca.o \
 		   usb.o device.o nvr.o nvr_at.o nvr_ps2.o \
 		   $(VNCOBJ)

src/win/win.c

@@ -431,7 +431,7 @@ main_thread(void *param)
     title_update = 1;
     old_time = GetTickCount();
     drawits = frames = 0;
-    while (!quited) {
+    while (!is_quit) {
 	/* See if it is time to run a frame of code. */
 	new_time = GetTickCount();
 	drawits += (new_time - old_time);
@@ -474,7 +474,7 @@ do_start(void)
     LARGE_INTEGER qpc;
 
     /* We have not stopped yet. */
-    quited = 0;
+    is_quit = 0;
 
     /* Initialize the high-precision timer. */
     timeBeginPeriod(1);
@@ -483,7 +483,7 @@ do_start(void)
     win_log("Main timer precision: %llu\n", timer_freq);
 
     /* Start the emulator, really. */
-    thMain = thread_create(main_thread, &quited);
+    thMain = thread_create(main_thread, &is_quit);
     SetThreadPriority(thMain, THREAD_PRIORITY_HIGHEST);
 }
 
@@ -492,7 +492,7 @@ do_start(void)
 void
 do_stop(void)
 {
-    quited = 1;
+    is_quit = 1;
 
     plat_delay_ms(100);
 

src/win/win_ui.c

@@ -1332,16 +1332,16 @@ ui_init(int nCmdShow)
     do_start();
 
     /* Run the message loop. It will run until GetMessage() returns 0 */
-    while (! quited) {
+    while (! is_quit) {
 	bRet = GetMessage(&messages, NULL, 0, 0);
-	if ((bRet == 0) || quited) break;
+	if ((bRet == 0) || is_quit) break;
 
 	if (bRet == -1) {
 		fatal("bRet is -1\n");
 	}
 
 	if (messages.message == WM_QUIT) {
-		quited = 1;
+		is_quit = 1;
 		break;
 	}