Introjucer: Added code to the win32 resource file to allow custom rc files to be included.

extras/Introjucer/Builds/VisualStudio2005/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -23,4 +27,6 @@ BEGIN
   END
 END
 
+#endif
+
 IDI_ICON1 ICON DISCARDABLE "icon.ico"

extras/Introjucer/Builds/VisualStudio2008/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -23,4 +27,6 @@ BEGIN
   END
 END
 
+#endif
+
 IDI_ICON1 ICON DISCARDABLE "icon.ico"

extras/Introjucer/Builds/VisualStudio2010/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -23,4 +27,6 @@ BEGIN
   END
 END
 
+#endif
+
 IDI_ICON1 ICON DISCARDABLE "icon.ico"

extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h

@@ -434,7 +434,11 @@ protected:
 
         MemoryOutputStream mo;
 
-        mo << "#undef  WIN32_LEAN_AND_MEAN" << newLine
+        mo << "#ifdef JUCE_USER_DEFINED_RC_FILE" << newLine
+           << " #include JUCE_USER_DEFINED_RC_FILE" << newLine
+           << "#else" << newLine
+           << newLine
+           << "#undef  WIN32_LEAN_AND_MEAN" << newLine
            << "#define WIN32_LEAN_AND_MEAN" << newLine
            << "#include <windows.h>" << newLine
            << newLine
@@ -459,7 +463,9 @@ protected:
            << "  BEGIN" << newLine
            << "    VALUE \"Translation\", 0x409, 65001" << newLine
            << "  END" << newLine
-           << "END" << newLine;
+           << "END" << newLine
+           << newLine
+           << "#endif" << newLine;
 
         if (iconFile != File::nonexistent)
            mo << newLine

extras/JuceDemo/Builds/VisualStudio2005/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -23,4 +27,6 @@ BEGIN
   END
 END
 
+#endif
+
 IDI_ICON1 ICON DISCARDABLE "icon.ico"

extras/JuceDemo/Builds/VisualStudio2008/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -23,4 +27,6 @@ BEGIN
   END
 END
 
+#endif
+
 IDI_ICON1 ICON DISCARDABLE "icon.ico"

extras/JuceDemo/Builds/VisualStudio2010/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -23,4 +27,6 @@ BEGIN
   END
 END
 
+#endif
+
 IDI_ICON1 ICON DISCARDABLE "icon.ico"

extras/audio plugin host/Builds/VisualStudio2005/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -22,3 +26,5 @@ BEGIN
     VALUE "Translation", 0x409, 65001
   END
 END
+
+#endif

extras/audio plugin host/Builds/VisualStudio2008/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -22,3 +26,5 @@ BEGIN
     VALUE "Translation", 0x409, 65001
   END
 END
+
+#endif

extras/binarybuilder/Builds/VisualStudio2008/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -21,3 +25,5 @@ BEGIN
     VALUE "Translation", 0x409, 65001
   END
 END
+
+#endif

extras/example projects/Builds/VisualStudio2005/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -22,3 +26,5 @@ BEGIN
     VALUE "Translation", 0x409, 65001
   END
 END
+
+#endif

extras/example projects/Builds/VisualStudio2008/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -22,3 +26,5 @@ BEGIN
     VALUE "Translation", 0x409, 65001
   END
 END
+
+#endif

extras/the jucer/Builds/VisualStudio2008/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -22,4 +26,6 @@ BEGIN
   END
 END
 
+#endif
+
 IDI_ICON1 ICON DISCARDABLE "icon.ico"

extras/the jucer/Builds/VisualStudio2010/resources.rc

@@ -1,3 +1,7 @@
+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
 #undef  WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -22,4 +26,6 @@ BEGIN
   END
 END
 
+#endif
+
 IDI_ICON1 ICON DISCARDABLE "icon.ico"