Bug 684155 - Remove MOZ_STATIC_BUILD r=khuey
--- a/browser/app/splash.rc
+++ b/browser/app/splash.rc
@@ -31,55 +31,22 @@
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
+
#include <windows.h>
#include "nsNativeAppSupportWin.h"
1 24 "firefox.exe.manifest"
IDI_APPICON ICON FIREFOX_ICO
IDI_DOCUMENT ICON DOCUMENT_ICO
IDI_APPLICATION ICON FIREFOX_ICO
STRINGTABLE DISCARDABLE
BEGIN
IDS_STARTMENU_APPNAME, "@MOZ_APP_DISPLAYNAME@"
END
-
-#ifdef MOZ_STATIC_BUILD
-
-// XXX This code is copied from resource.h and widget.rc. It's a work-around
-// for the limitation that only one resource file can be used in an .exe. We
-// should develop a method, for static builds only, to combine multiple .rc
-// files into a single .rc file, and then use that to build the single .res
-// file for the .exe.
-
-#define IDC_GRAB 4101
-#define IDC_GRABBING 4102
-#define IDC_CELL 4103
-#define IDC_COPY 4104
-#define IDC_ALIAS 4105
-#define IDC_ZOOMIN 4106
-#define IDC_ZOOMOUT 4107
-#define IDC_COLRESIZE 4108
-#define IDC_ROWRESIZE 4109
-#define IDC_VERTICALTEXT 4110
-#define IDC_NONE 4112
-
-IDC_GRAB CURSOR DISCARDABLE "../../widget/src/build/res/grab.cur"
-IDC_GRABBING CURSOR DISCARDABLE "../../widget/src/build/res/grabbing.cur"
-IDC_CELL CURSOR DISCARDABLE "../../widget/src/build/res/cell.cur"
-IDC_COPY CURSOR DISCARDABLE "../../widget/src/build/res/copy.cur"
-IDC_ALIAS CURSOR DISCARDABLE "../../widget/src/build/res/aliasb.cur"
-IDC_ZOOMIN CURSOR DISCARDABLE "../../widget/src/build/res/zoom_in.cur"
-IDC_ZOOMOUT CURSOR DISCARDABLE "../../widget/src/build/res/zoom_out.cur"
-IDC_COLRESIZE CURSOR DISCARDABLE "../../widget/src/build/res/col_resize.cur"
-IDC_ROWRESIZE CURSOR DISCARDABLE "../../widget/src/build/res/row_resize.cur"
-IDC_VERTICALTEXT CURSOR DISCARDABLE "../../widget/src/build/res/vertical_text.cur"
-IDC_NONE CURSOR DISCARDABLE "../../widget/src/build/res/none.cur"
-
-#endif
--- a/browser/app/splashos2.rc
+++ b/browser/app/splashos2.rc
@@ -32,16 +32,17 @@
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
+
#include <os2.h>
// Splash screen dialog ID.
#define IDD_SPLASH 100
// Splash screen bitmap ID.
#define IDB_SPLASH 101
@@ -50,29 +51,8 @@ ICON 1 FIREFOX_ICO
DLGTEMPLATE IDD_SPLASH DISCARDABLE
BEGIN
DIALOG "", IDD_SPLASH, 0, 0, 390, 261, , FCF_BORDER
BEGIN
END
END
//BITMAP IDB_SPLASH "splash.bmp"
-
-#ifdef MOZ_STATIC_BUILD
-#include "wdgtos2rc.h"
-
-POINTER IDC_SELECTANCHOR "..\\..\\widget\\src\\os2\\res\\select.ptr"
-POINTER IDC_GRAB "..\\..\\widget\\src\\os2\\res\\grab.ptr"
-POINTER IDC_GRABBING "..\\..\\widget\\src\\os2\\res\\grabbing.ptr"
-POINTER IDC_CELL "..\\..\\widget\\src\\os2\\res\\cell.ptr"
-POINTER IDC_COPY "..\\..\\widget\\src\\os2\\res\\copy.ptr"
-POINTER IDC_ALIAS "..\\..\\widget\\src\\os2\\res\\aliasb.ptr"
-POINTER IDC_ZOOMIN "..\\..\\widget\\src\\os2\\res\\zoom_in.ptr"
-POINTER IDC_ZOOMOUT "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr"
-
-POINTER IDC_ARROWWAIT "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr"
-POINTER IDC_CROSS "..\\..\\widget\\src\\os2\\res\\crosshair.ptr"
-POINTER IDC_HELP "..\\..\\widget\\src\\os2\\res\\help.ptr"
-POINTER IDC_NONE "..\\..\\widget\\src\\os2\\res\\none.ptr"
-
-ICON IDC_DNDURL "..\\..\\widget\\src\\os2\\res\\dndurl.ico"
-ICON IDC_DNDTEXT "..\\..\\widget\\src\\os2\\res\\dndtext.ico"
-#endif
--- a/gfx/thebes/gfxTypes.h
+++ b/gfx/thebes/gfxTypes.h
@@ -42,19 +42,17 @@
#include "nsAtomicRefcnt.h"
/**
* Currently needs to be 'double' for Cairo compatibility. Could
* become 'float', perhaps, in some configurations.
*/
typedef double gfxFloat;
-#if defined(MOZ_STATIC_BUILD)
-# define THEBES_API
-#elif defined(IMPL_THEBES)
+#if defined(IMPL_THEBES)
# define THEBES_API NS_EXPORT
#else
# define THEBES_API NS_IMPORT
#endif
/**
* gfx errors
*/
--- a/xulrunner/app/splash.rc
+++ b/xulrunner/app/splash.rc
@@ -31,16 +31,17 @@
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
+
#include <windows.h>
#include "nsNativeAppSupportWin.h"
1 24 "xulrunner.exe.manifest"
IDI_APPICON ICON XULRUNNER_ICO
IDI_DOCUMENT ICON DOCUMENT_ICO
IDI_APPLICATION ICON XULRUNNER_ICO
@@ -48,42 +49,8 @@ IDI_APPLICATION ICON XULRUNNER_ICO
STRINGTABLE DISCARDABLE
BEGIN
#ifdef DEBUG
IDS_STARTMENU_APPNAME, "Firefox Debug"
#else
IDS_STARTMENU_APPNAME, "Firefox"
#endif
END
-
-#ifdef MOZ_STATIC_BUILD
-
-// XXX This code is copied from resource.h and widget.rc. It's a work-around
-// for the limitation that only one resource file can be used in an .exe. We
-// should develop a method, for static builds only, to combine multiple .rc
-// files into a single .rc file, and then use that to build the single .res
-// file for the .exe.
-
-#define IDC_GRAB 4101
-#define IDC_GRABBING 4102
-#define IDC_CELL 4103
-#define IDC_COPY 4104
-#define IDC_ALIAS 4105
-#define IDC_ZOOMIN 4106
-#define IDC_ZOOMOUT 4107
-#define IDC_COLRESIZE 4108
-#define IDC_ROWRESIZE 4109
-#define IDC_VERTICALTEXT 4110
-#define IDC_NONE 4112
-
-IDC_GRAB CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\grab.cur"
-IDC_GRABBING CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\grabbing.cur"
-IDC_CELL CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\cell.cur"
-IDC_COPY CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\copy.cur"
-IDC_ALIAS CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\aliasb.cur"
-IDC_ZOOMIN CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\zoom_in.cur"
-IDC_ZOOMOUT CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\zoom_out.cur"
-IDC_COLRESIZE CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\col_resize.cur"
-IDC_ROWRESIZE CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\row_resize.cur"
-IDC_VERTICALTEXT CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\vertical_text.cur"
-IDC_NONE CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\none.cur"
-
-#endif
--- a/xulrunner/app/splashos2.rc
+++ b/xulrunner/app/splashos2.rc
@@ -32,16 +32,17 @@
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
+
#include <os2.h>
// Splash screen dialog ID.
#define IDD_SPLASH 100
// Splash screen bitmap ID.
#define IDB_SPLASH 101
@@ -50,29 +51,8 @@ ICON 1 XULRUNNER_ICO
DLGTEMPLATE IDD_SPLASH DISCARDABLE
BEGIN
DIALOG "", IDD_SPLASH, 0, 0, 390, 261, , FCF_BORDER
BEGIN
END
END
//BITMAP IDB_SPLASH "splash.bmp"
-
-#ifdef MOZ_STATIC_BUILD
-#include "wdgtos2rc.h"
-
-POINTER IDC_SELECTANCHOR "..\\..\\widget\\src\\os2\\res\\select.ptr"
-POINTER IDC_GRAB "..\\..\\widget\\src\\os2\\res\\grab.ptr"
-POINTER IDC_GRABBING "..\\..\\widget\\src\\os2\\res\\grabbing.ptr"
-POINTER IDC_CELL "..\\..\\widget\\src\\os2\\res\\cell.ptr"
-POINTER IDC_COPY "..\\..\\widget\\src\\os2\\res\\copy.ptr"
-POINTER IDC_ALIAS "..\\..\\widget\\src\\os2\\res\\aliasb.ptr"
-POINTER IDC_ZOOMIN "..\\..\\widget\\src\\os2\\res\\zoom_in.ptr"
-POINTER IDC_ZOOMOUT "..\\..\\widget\\src\\os2\\res\\zoom_out.ptr"
-
-POINTER IDC_ARROWWAIT "..\\..\\widget\\src\\os2\\res\\arrow_wait.ptr"
-POINTER IDC_CROSS "..\\..\\widget\\src\\os2\\res\\crosshair.ptr"
-POINTER IDC_HELP "..\\..\\widget\\src\\os2\\res\\help.ptr"
-POINTER IDC_NONE "..\\..\\widget\\src\\os2\\res\\none.ptr"
-
-ICON IDC_DNDURL "..\\..\\widget\\src\\os2\\res\\dndurl.ico"
-ICON IDC_DNDTEXT "..\\..\\widget\\src\\os2\\res\\dndtext.ico"
-#endif