diff --git a/extras/Introjucer/Builds/VisualStudio2005/resources.rc b/extras/Introjucer/Builds/VisualStudio2005/resources.rc index 5123b6b162..ac146311a6 100644 --- a/extras/Introjucer/Builds/VisualStudio2005/resources.rc +++ b/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 @@ -23,4 +27,6 @@ BEGIN END END +#endif + IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file diff --git a/extras/Introjucer/Builds/VisualStudio2008/resources.rc b/extras/Introjucer/Builds/VisualStudio2008/resources.rc index 5123b6b162..ac146311a6 100644 --- a/extras/Introjucer/Builds/VisualStudio2008/resources.rc +++ b/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 @@ -23,4 +27,6 @@ BEGIN END END +#endif + IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file diff --git a/extras/Introjucer/Builds/VisualStudio2010/resources.rc b/extras/Introjucer/Builds/VisualStudio2010/resources.rc index 5123b6b162..ac146311a6 100644 --- a/extras/Introjucer/Builds/VisualStudio2010/resources.rc +++ b/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 @@ -23,4 +27,6 @@ BEGIN END END +#endif + IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h index 29b09323e3..2ad75672bc 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h +++ b/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 " << 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 diff --git a/extras/JuceDemo/Builds/VisualStudio2005/resources.rc b/extras/JuceDemo/Builds/VisualStudio2005/resources.rc index 5cecb53e0f..1d120ce08a 100644 --- a/extras/JuceDemo/Builds/VisualStudio2005/resources.rc +++ b/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 @@ -23,4 +27,6 @@ BEGIN END END +#endif + IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file diff --git a/extras/JuceDemo/Builds/VisualStudio2008/resources.rc b/extras/JuceDemo/Builds/VisualStudio2008/resources.rc index 5cecb53e0f..1d120ce08a 100644 --- a/extras/JuceDemo/Builds/VisualStudio2008/resources.rc +++ b/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 @@ -23,4 +27,6 @@ BEGIN END END +#endif + IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file diff --git a/extras/JuceDemo/Builds/VisualStudio2010/resources.rc b/extras/JuceDemo/Builds/VisualStudio2010/resources.rc index 5cecb53e0f..1d120ce08a 100644 --- a/extras/JuceDemo/Builds/VisualStudio2010/resources.rc +++ b/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 @@ -23,4 +27,6 @@ BEGIN END END +#endif + IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file diff --git a/extras/audio plugin host/Builds/VisualStudio2005/resources.rc b/extras/audio plugin host/Builds/VisualStudio2005/resources.rc index 062d857963..4c25e4afe6 100644 --- a/extras/audio plugin host/Builds/VisualStudio2005/resources.rc +++ b/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 @@ -22,3 +26,5 @@ BEGIN VALUE "Translation", 0x409, 65001 END END + +#endif diff --git a/extras/audio plugin host/Builds/VisualStudio2008/resources.rc b/extras/audio plugin host/Builds/VisualStudio2008/resources.rc index 062d857963..4c25e4afe6 100644 --- a/extras/audio plugin host/Builds/VisualStudio2008/resources.rc +++ b/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 @@ -22,3 +26,5 @@ BEGIN VALUE "Translation", 0x409, 65001 END END + +#endif diff --git a/extras/binarybuilder/Builds/VisualStudio2008/resources.rc b/extras/binarybuilder/Builds/VisualStudio2008/resources.rc index 656bc7b3b6..30d05c50cf 100644 --- a/extras/binarybuilder/Builds/VisualStudio2008/resources.rc +++ b/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 @@ -21,3 +25,5 @@ BEGIN VALUE "Translation", 0x409, 65001 END END + +#endif diff --git a/extras/example projects/Builds/VisualStudio2005/resources.rc b/extras/example projects/Builds/VisualStudio2005/resources.rc index ec2189b1fb..e1e4d6af2e 100644 --- a/extras/example projects/Builds/VisualStudio2005/resources.rc +++ b/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 @@ -22,3 +26,5 @@ BEGIN VALUE "Translation", 0x409, 65001 END END + +#endif diff --git a/extras/example projects/Builds/VisualStudio2008/resources.rc b/extras/example projects/Builds/VisualStudio2008/resources.rc index ec2189b1fb..e1e4d6af2e 100644 --- a/extras/example projects/Builds/VisualStudio2008/resources.rc +++ b/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 @@ -22,3 +26,5 @@ BEGIN VALUE "Translation", 0x409, 65001 END END + +#endif diff --git a/extras/the jucer/Builds/VisualStudio2008/resources.rc b/extras/the jucer/Builds/VisualStudio2008/resources.rc index a842a965d6..6bf50d3b9f 100644 --- a/extras/the jucer/Builds/VisualStudio2008/resources.rc +++ b/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 @@ -22,4 +26,6 @@ BEGIN END END +#endif + IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file diff --git a/extras/the jucer/Builds/VisualStudio2010/resources.rc b/extras/the jucer/Builds/VisualStudio2010/resources.rc index a842a965d6..6bf50d3b9f 100644 --- a/extras/the jucer/Builds/VisualStudio2010/resources.rc +++ b/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 @@ -22,4 +26,6 @@ BEGIN END END +#endif + IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file