Merge trunk HEAD (r46369)

[reactos.git] / reactos / tools / rbuild / backend / mingw / modulehandler.h

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index 4fe3277..b67f63f 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -11,12 +11,12 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef MINGW_MODULEHANDLER_H
-#define MINGW_MODULEHANDLER_H
+
+#pragma once
 
 #include "../backend.h"
 #include "mingw.h"
@@ -32,13 +32,6 @@ PrefixFilename (
        const std::string& filename,
        const std::string& prefix );
 
-enum SpecFileType
-{
-    None,
-    Spec = 1,
-    PSpec = 2
-};
-
 class MingwModuleHandler
 {
 public:
@@ -113,15 +106,9 @@ protected:
        std::string GetLinkerMacro () const;
        static std::string GetDebugFormat ();
        void GenerateCleanObjectsAsYouGoCode () const;
-       void GenerateRunRsymCode () const;
-       void GenerateRunStripCode () const;
-       void GenerateLinkerCommand ( const std::string& dependencies,
-                                    const std::string& linkerParameters,
-                                    const std::string& pefixupParameters );
-       void GeneratePhonyTarget() const;
+       void GenerateLinkerCommand () const;
        void GenerateBuildMapCode ( const FileLocation *mapTarget = NULL );
        void GenerateRules ();
-       void GenerateImportLibraryTarget (const FileLocation *defFilename, const FileLocation *library_target, bool delayimp);
        void GenerateImportLibraryTargetIfNeeded ();
        void GetDefinitionDependencies ( std::vector<FileLocation>& dependencies ) const;
        std::string GetLinkingDependencies () const;
@@ -323,8 +310,10 @@ private:
        void GetBootstrapCdFiles ( std::vector<FileLocation>& out ) const;
        void GetNonModuleCdFiles ( std::vector<FileLocation>& out ) const;
        void GetCdFiles ( std::vector<FileLocation>& out ) const;
-       void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory );
-       void OutputCdfileCopyCommands ( const std::string& bootcdDirectory );
+       void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory,
+                                              std::vector<FileLocation>& destinations );
+       void OutputCdfileCopyCommands ( const std::string& bootcdDirectory,
+                                       std::vector<FileLocation>& destinations );
 };
 
 
@@ -381,5 +370,3 @@ public:
        MingwElfExecutableModuleHandler ( const Module& module );
        virtual void Process ();
 };
-
-#endif /* MINGW_MODULEHANDLER_H */