صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
Apq
/
CMake
mirrorاز https://github.com/Kitware/CMake.git
1
0
انشعاب 0
پرونده‌ها مشکلات 0 ویکی
فهرست منبع

ENH: add include paths to rc program for resource generation

Bill Hoffman 23 سال پیش
والد
6f310818e1
کامیت
6046060714
7فایلهای تغییر یافته به همراه26 افزوده شده و 18 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 1 1
      Source/cmBorlandMakefileGenerator.cxx
  2. 8 0
      Source/cmMSDotNETGenerator.cxx
  3. 1 1
      Source/cmNMakeMakefileGenerator.cxx
  4. 4 4
      Templates/DLLHeader.dsptemplate
  5. 4 4
      Templates/EXEHeader.dsptemplate
  6. 4 4
      Templates/EXEWinHeader.dsptemplate
  7. 4 4
      Templates/staticLibHeader.dsptemplate

+ 1 - 1
Source/cmBorlandMakefileGenerator.cxx
مشاهده فایل 

@@ -200,7 +200,7 @@ OutputBuildObjectFromSource(std::ostream& fout,
 
     }
 
   else if (ext == "rc")
 
     {
 
-    compileCommand = "$(RC) -o\"";
 
+    compileCommand = "$(RC) $(INCLUDE_FLAGS) -o\"";
 
     compileCommand += objectFile;
 
     compileCommand += "\" ";
 
     compileCommand +=

+ 8 - 0
Source/cmMSDotNETGenerator.cxx
مشاهده فایل 

@@ -811,6 +811,14 @@ void cmMSDotNETGenerator::WriteConfiguration(std::ostream& fout,
 
   fout << "/>\n";  // end of <Tool Name=VCCLCompilerTool
 
 
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCCustomBuildTool\"/>\n";
 
+  fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCResourceCompilerTool\"\n"
 
+       << "AdditionalIncludeDirectories=\"";
 
+  for(i = includes.begin();i != includes.end(); ++i)
 
+    {
 
+    std::string ipath = this->ConvertToXMLOutputPath(i->c_str());
 
+    fout << ipath << ";";
 
+    }
 
+  fout << "\"\n/>\n";
 
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCMIDLTool\"/>\n";
 
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCPostBuildEventTool\"";
 
   this->OutputTargetRules(fout, target, libName);

+ 1 - 1
Source/cmNMakeMakefileGenerator.cxx
مشاهده فایل 

@@ -360,7 +360,7 @@ OutputBuildObjectFromSource(std::ostream& fout,
 
     }
 
   else if (ext == "rc")
 
     {
 
-    compileCommand = "$(RC) /fo\"";
 
+    compileCommand = "$(RC) $(INCLUDE_FLAGS) /fo\"";
 
     compileCommand += objectFile;
 
     compileCommand += "\" ";
 
     compileCommand +=

+ 4 - 4
Templates/DLLHeader.dsptemplate
مشاهده فایل 

@@ -65,7 +65,7 @@ RSC=rc.exe
 
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -96,7 +96,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -129,7 +129,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -160,7 +160,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

+ 4 - 4
Templates/EXEHeader.dsptemplate
مشاهده فایل 

@@ -62,7 +62,7 @@ RSC=rc.exe
 
 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -94,7 +94,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -123,7 +123,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -153,7 +153,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

+ 4 - 4
Templates/EXEWinHeader.dsptemplate
مشاهده فایل 

@@ -64,7 +64,7 @@ RSC=rc.exe
 
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -96,7 +96,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -126,7 +126,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -158,7 +158,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

+ 4 - 4
Templates/staticLibHeader.dsptemplate
مشاهده فایل 

@@ -59,7 +59,7 @@ RSC=rc.exe
 
 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -87,7 +87,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -115,7 +115,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -143,7 +143,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

+# ADD RSC BUILD_INCLUDES /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo