[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bochs-cvs
Subject:    [Bochs-cvs] [12078] trunk/bochs
From:       vruppert () users ! sourceforge ! net
Date:       2013-12-28 15:11:13
Message-ID: E1VwvXp-0007gr-GB () sfs-ml-2 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 12078
Author:   vruppert
Date:     2013-12-28 15:11:13 +0000 (Sat, 28 Dec 2013)
Log Message:
-----------
Modified win32 resource files based on patch.mingw-resources. We already use
forward slashes partly in the rc files without errors in MSVC, so we should
use it for all include paths to fix MinGW warnings. Removed original patch.

Modified Paths:
--------------
    trunk/bochs/win32res.rc
    trunk/bochs/wxbochs.rc

Removed Paths:
-------------
    trunk/bochs/patches/patch.mingw-resources

Deleted: trunk/bochs/patches/patch.mingw-resources
===================================================================
--- trunk/bochs/patches/patch.mingw-resources	2013-12-28 12:57:21 UTC (rev 12077)
+++ trunk/bochs/patches/patch.mingw-resources	2013-12-28 15:11:13 UTC (rev 12078)
@@ -1,53 +0,0 @@
-----------------------------------------------------------------------
-Patch name: patch.mingw-resources
-Author: Jeroen Janssen
-Date: 2003-08-19
-Status: not applied
-
-Detailed description:
-
-Changes the .rc (resource) files to use forware (/) style slashes
-instead of backwards style ones. 
-This allows for crosscompilation from linux using a crosscompiler.
-
-
-Patch was created with:
-  cvs diff -u
-Apply patch to what version:
-  cvs checked out on DATE, release version VER
-Instructions:
-  To patch, go to main bochs directory.
-  Type "patch -p0 < THIS_PATCH_FILE".
-----------------------------------------------------------------------
-
-Index: win32res.rc
-===================================================================
-RCS file: /cvsroot/bochs/bochs/win32res.rc,v
-retrieving revision 1.4
-diff -u -r1.4 win32res.rc
---- win32res.rc	15 Jul 2003 21:02:05 -0000	1.4
-+++ win32res.rc	19 Aug 2003 16:40:03 -0000
-@@ -1,7 +1,7 @@
- #include <windows.h>
--#include "gui\win32res.h"
-+#include "gui/win32res.h"
- 
--ICON_BOCHS ICON build\win32\nsis\bochs.ico
-+ICON_BOCHS ICON build/win32/nsis/bochs.ico
- 
- ASK_DLG DIALOG 30, 30, 200, 100
- STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-Index: wxbochs.rc
-===================================================================
-RCS file: /cvsroot/bochs/bochs/wxbochs.rc,v
-retrieving revision 1.4
-diff -u -r1.4 wxbochs.rc
---- wxbochs.rc	13 Jul 2003 23:30:55 -0000	1.4
-+++ wxbochs.rc	19 Aug 2003 16:40:03 -0000
-@@ -1,5 +1,5 @@
- #include "config.h"
--icon_bochs ICON build\win32\nsis\bochs.ico
-+icon_bochs ICON build/win32/nsis/bochs.ico
- #include "wx/msw/wx.rc"
- #if BX_WITH_WIN32
- #include "win32res.rc"
\ No newline at end of file

Modified: trunk/bochs/win32res.rc
===================================================================
--- trunk/bochs/win32res.rc	2013-12-28 12:57:21 UTC (rev 12077)
+++ trunk/bochs/win32res.rc	2013-12-28 15:11:13 UTC (rev 12078)
@@ -1,12 +1,12 @@
 #define ISOLATION_AWARE_ENABLED
 #include <windows.h>
-#include "gui\win32res.h"
+#include "gui/win32res.h"
 
-ICON_BOCHS ICON build\win32\nsis\bochs.ico
-ICON_BOCHS2 ICON build\win32\nsis\logo.ico
+ICON_BOCHS ICON build/win32/nsis/bochs.ico
+ICON_BOCHS2 ICON build/win32/nsis/logo.ico
 
 // Manifest for both 32-bit and 64-bit Windows
-1 24 build\win32\bochs.manifest
+1 24 build/win32/bochs.manifest
 
 ASK_DLG DIALOG 30, 30, 200, 100
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

Modified: trunk/bochs/wxbochs.rc
===================================================================
--- trunk/bochs/wxbochs.rc	2013-12-28 12:57:21 UTC (rev 12077)
+++ trunk/bochs/wxbochs.rc	2013-12-28 15:11:13 UTC (rev 12078)
@@ -1,11 +1,11 @@
-#include "config.h"
-icon_bochs ICON build\win32\nsis\bochs.ico
-#include "wx/msw/wx.rc"
-#if BX_WITH_WIN32
-#include "win32res.rc"
-#else
-#if BX_DEBUGGER_GUI
-#include "win32_enh_dbg.rc"
-#endif
-#include "bxversion.rc"
-#endif
+#include "config.h"
+icon_bochs ICON build/win32/nsis/bochs.ico
+#include "wx/msw/wx.rc"
+#if BX_WITH_WIN32
+#include "win32res.rc"
+#else
+#if BX_DEBUGGER_GUI
+#include "win32_enh_dbg.rc"
+#endif
+#include "bxversion.rc"
+#endif


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]