From d764689d055d7d8364c35f0b7cf2c915c5bdb38c Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 15 Aug 2016 02:15:51 +0200 Subject: [PATCH] Rename from PCem-Unofficial v11 to 86Box v1. --- README.md | 8 ++++---- src/Makefile.mingw | 12 +++++------- src/Makefile.mingw64 | 10 +++++----- src/pc.c | 2 +- src/win-d3d-fs.cc | 2 +- src/win.c | 2 +- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index b6ccfb60f..cbfd18e50 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# PCem Unofficial [![Build Status](http://polar.rol.im/job/PCem-Unofficial/badge/icon)](http://polar.rol.im/job/PCem-Unofficial) -PCem Unofficial (formerly PCem Experimental or PCem-X) is an unofficial branch of the PCem emulator, which aims to emulate IBM compatible machines from 1981-2000 period. This branch adds several emulated motherboards. +# 86Box [![Build Status](http://polar.rol.im/job/86Box/badge/icon)](http://polar.rol.im/job/86Box) +86Box (formerly PCem Unofficial, PCem Experimental, or PCem-X) is an unofficial branch of the PCem emulator, which aims to emulate IBM compatible machines from 1981-2000 period. This branch adds several emulated motherboards. --- -Keep in touch with the PCem Unofficial community: +Keep in touch with the 86Box community: -[![Visit our IRC channel](https://kiwiirc.com/buttons/irc.rol.im/softhistory.png)](https://kiwiirc.com/client/irc.rol.im/?nick=pcem|?#softhistory) +[![Visit our IRC channel](https://kiwiirc.com/buttons/irc.rol.im/softhistory.png)](https://kiwiirc.com/client/irc.rol.im/?nick=86box|?#softhistory) diff --git a/src/Makefile.mingw b/src/Makefile.mingw index 3da0da7d6..28351275d 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -2,7 +2,7 @@ VPATH = . dosbox resid-fp slirp CPP = g++.exe CC = gcc.exe WINDRES = windres.exe -CFLAGS = -O3 -march=native -mtune=native -fbranch-probabilities -fvpt -funroll-loops -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse -mstackrealign -g +CFLAGS = -O3 -march=native -mtune=native -fbranch-probabilities -fvpt -funroll-loops -fpeel-loops -ftracer -fomit-frame-pointer -ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse -mstackrealign OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o acerm3a.o ali1429.o amstrad.o cdrom-ioctl.o cdrom-iso.o \ cdrom-null.o codegen.o codegen_ops.o codegen_timing_486.o codegen_timing_686.o codegen_timing_pentium.o codegen_timing_winchip.o codegen_x86.o compaq.o config.o cpu.o dac.o \ device.o disc.o disc_fdi.o disc_img.o disc_sector_86box.o dma.o fdc.o fdc37c665.o fdc37c932fr.o fdd.o fdi2raw.o gameport.o headland.o i430hx.o i430lx.o i430fx.o \ @@ -28,13 +28,11 @@ SLIRPOBJ = bootp.o ip_icmp.o misc.o socket.o tcp_timer.o cksum.o ip_input.o queu LIBS = -mwindows -lwinmm -lopenal.dll -lopenal -lddraw -ldinput8 -ldxguid -ld3d9 -ld3dx9 -lwsock32 -liphlpapi -lstdc++ -static-libstdc++ -static-libgcc -static -PCem.exe: $(OBJ) $(DBOBJ) $(SIDOBJ) $(SLIRPOBJ) - $(CC) $(OBJ) $(DBOBJ) $(SIDOBJ) $(SLIRPOBJ) -o "PCem.exe" $(LIBS) +86Box.exe: $(OBJ) $(DBOBJ) $(SIDOBJ) $(SLIRPOBJ) + $(CC) $(OBJ) $(DBOBJ) $(SIDOBJ) $(SLIRPOBJ) -o "86Box.exe" $(LIBS) + strip "86Box.exe" - -a.exe: strip "PCem.exe" - -all : PCem.exe +all : 86Box.exe clean : rm *.o diff --git a/src/Makefile.mingw64 b/src/Makefile.mingw64 index 4a88abf60..bf05e2155 100644 --- a/src/Makefile.mingw64 +++ b/src/Makefile.mingw64 @@ -28,12 +28,12 @@ SLIRPOBJ = bootp.o ip_icmp.o misc.o socket.o tcp_timer.o cksum.o ip_input.o queu LIBS = -mwindows -lwinmm -lopenal -lddraw -ldinput8 -ldxguid -ld3d9 -ld3dx9 -lwsock32 -liphlpapi -lstdc++ -static-libstdc++ -static-libgcc -static -lopenal.dll -lgcov -lPacket -lwpcap -PCem64.exe: $(OBJ) $(DBOBJ) $(SIDOBJ) $(SLIRPOBJ) - $(CC) $(OBJ) $(DBOBJ) $(SIDOBJ) $(SLIRPOBJ) -o "PCem64.exe" $(LIBS) - strip "PCem64.exe" - peflags --bigaddr=false PCem64.exe +86Box64.exe: $(OBJ) $(DBOBJ) $(SIDOBJ) $(SLIRPOBJ) + $(CC) $(OBJ) $(DBOBJ) $(SIDOBJ) $(SLIRPOBJ) -o "86Box64.exe" $(LIBS) + strip "86Box64.exe" + peflags --bigaddr=false 86Box64.exe -all : PCem64.exe +all : 86Box64.exe clean : rm *.o diff --git a/src/pc.c b/src/pc.c index 5754eaf23..0566e3f1e 100644 --- a/src/pc.c +++ b/src/pc.c @@ -512,7 +512,7 @@ void runpc() if (win_title_update) { win_title_update=0; - sprintf(s, "PCem v11 [Unofficial] - %i%% - %s - %s - %s", fps, model_getname(), models[model].cpu[cpu_manufacturer].cpus[cpu].name, (!mousecapture) ? "Click to capture mouse" : "Press F12-F8 or middle button to release mouse"); + sprintf(s, "86Box v1 - %i%% - %s - %s - %s", fps, model_getname(), models[model].cpu[cpu_manufacturer].cpus[cpu].name, (!mousecapture) ? "Click to capture mouse" : "Press F12-F8 or middle button to release mouse"); set_window_title(s); } done++; diff --git a/src/win-d3d-fs.cc b/src/win-d3d-fs.cc index 367b372e5..58e9df9b9 100644 --- a/src/win-d3d-fs.cc +++ b/src/win-d3d-fs.cc @@ -89,7 +89,7 @@ void d3d_fs_init(HWND h) d3d_device_window = CreateWindowEx ( 0, szSubClassName, - "PCem v11 [Experimental]", + "86Box v1", WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, diff --git a/src/win.c b/src/win.c index dd0e3fab0..24841e5a3 100644 --- a/src/win.c +++ b/src/win.c @@ -561,7 +561,7 @@ int WINAPI WinMain (HINSTANCE hThisInstance, hwnd = CreateWindowEx ( 0, /* Extended possibilites for variation */ szClassName, /* Classname */ - "PCem v11 [Unofficial]", /* Title Text */ + "86Box v1", /* Title Text */ WS_OVERLAPPEDWINDOW&~WS_SIZEBOX, /* default window */ CW_USEDEFAULT, /* Windows decides the position */ CW_USEDEFAULT, /* where the window ends up on the screen */