mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- new application icon for the win32 gui using 'bochs.ico'

Browse Source
This commit is contained in:
Volker Ruppert 2002-12-26 18:24:41 +00:00
parent 475a3e7fb6
commit ef8a7b1dc6
6 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/Makefile.in
View File

@ -238,7 +238,7 @@ $(BX_OBJS): $(BX_INCLUDES)
bxversion.h:
$(RM) -f bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
echo '// $$Id: Makefile.in,v 1.143 2002-12-24 15:01:12 bdenney Exp $$' >> bxversion.h
echo '// $$Id: Makefile.in,v 1.144 2002-12-26 18:24:32 vruppert Exp $$' >> bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
echo '// This file is generated by "make bxversion.h"' >> bxversion.h
echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
@ -298,6 +298,10 @@ libbochs_cpu.a: @DEBUGGER_VAR@ $(BX_OBJS)
wxbochs_resources.o: wxbochs.rc
windres $(srcdir)/wxbochs.rc -o $@ --include-dir=`@WX_CONFIG@ --prefix`/include
# for win32 gui
win32res.o: win32res.rc
windres $(srcdir)/win32res.rc -o $@
#####################################################################
# Install target for all platforms.
#####################################################################

3
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in,v 1.193 2002/12/21 14:31:24 bdenney Exp .
# From configure.in Id: configure.in,v 1.194 2002/12/21 16:36:07 bdenney Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53.
#
@ -21274,6 +21274,7 @@ _ACEOF
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_WIN32_VCPP)"
;;
*-cygwin* | *-mingw32*)
EXTRA_BX_OBJS="$EXTRA_BX_OBJS win32res.o"
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_WIN32)"
;;
*) echo Unsupported compile setup: GUI library is win32, but target is neither windows nor cygwin.

3
bochs/configure.in
View File

@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(bochs.h)
AC_REVISION([[$Id: configure.in,v 1.194 2002-12-21 16:36:07 bdenney Exp $]])
AC_REVISION([[$Id: configure.in,v 1.195 2002-12-26 18:24:40 vruppert Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -1770,6 +1770,7 @@ if test "$with_win32" = yes; then
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_WIN32_VCPP)"
;;
*-cygwin* | *-mingw32*)
EXTRA_BX_OBJS="$EXTRA_BX_OBJS win32res.o"
GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_WIN32)"
;;
*) echo Unsupported compile setup: GUI library is win32, but target is neither windows nor cygwin.

10
bochs/gui/win32.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: win32.cc,v 1.47 2002-11-19 05:47:44 bdenney Exp $
// $Id: win32.cc,v 1.48 2002-12-26 18:24:40 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -36,7 +36,7 @@
#include "bochs.h"
#if BX_WITH_WIN32
#include "icon_bochs.h"
#include "win32res.h"
#include "font/vga.bitmap.h"
// windows.h is included by bochs.h
#include <commctrl.h>
@ -387,12 +387,11 @@ VOID UIThread(PVOID pvoid) {
wndclass.cbClsExtra = 0;
wndclass.cbWndExtra = 0;
wndclass.hInstance = stInfo.hInstance;
wndclass.hIcon = LoadIcon (NULL, IDI_APPLICATION);
wndclass.hIcon = LoadIcon (stInfo.hInstance, MAKEINTRESOURCE(ICON_BOCHS));
wndclass.hCursor = LoadCursor (NULL, IDC_ARROW);
wndclass.hbrBackground = (HBRUSH) GetStockObject (BLACK_BRUSH);
wndclass.lpszMenuName = NULL;
wndclass.lpszClassName = szAppName;
wndclass.hIconSm = LoadIcon (NULL, IDI_APPLICATION);
RegisterClassEx (&wndclass);
@ -402,12 +401,11 @@ VOID UIThread(PVOID pvoid) {
wndclass.cbClsExtra = 0;
wndclass.cbWndExtra = 0;
wndclass.hInstance = stInfo.hInstance;
wndclass.hIcon = LoadIcon (NULL, IDI_APPLICATION);
wndclass.hIcon = NULL;
wndclass.hCursor = LoadCursor (NULL, IDC_ARROW);
wndclass.hbrBackground = (HBRUSH) GetStockObject (BLACK_BRUSH);
wndclass.lpszMenuName = NULL;
wndclass.lpszClassName = "SIMWINDOW";
wndclass.hIconSm = NULL;
RegisterClassEx (&wndclass);

1
bochs/gui/win32res.h Normal file
View File

@ -0,0 +1 @@
#define ICON_BOCHS 1000

4
bochs/win32res.rc Normal file
View File

@ -0,0 +1,4 @@
#include <windows.h>
#include "gui\win32res.h"
ICON_BOCHS ICON build\win32\nsis\bochs.ico