In MSVC++, we can use the __declspec(export) keyword instead of .def …

…files So get rid of the .def files and the corresponding VC++ project property, define the export declaration in the imodule.h header.
codereader · Dec 26, 2016 · 4ac1910 · 4ac1910
1 parent 3df299f
commit 4ac1910
Show file tree

Hide file tree

Showing 65 changed files with 255 additions and 333 deletions.
diff --git a/include/imodule.h b/include/imodule.h
@@ -326,7 +326,12 @@ namespace module {
 // Platform-specific definition which needs to be defined both
 // in the plugins and the main binary.
 #if defined(WIN32)
-	#define DARKRADIANT_DLLEXPORT __stdcall
+	#if defined(_MSC_VER)
+		// In VC++ we use this to export symbols instead of using .def files
+		#define DARKRADIANT_DLLEXPORT __declspec(dllexport) __stdcall
+	#else
+		#define DARKRADIANT_DLLEXPORT __stdcall 
+	#endif
 #else
 	#define DARKRADIANT_DLLEXPORT
 #endif
diff --git a/plugins/archivezip/archivezip.def b/plugins/archivezip/archivezip.def
diff --git a/plugins/commandsystem/commandsystem.def b/plugins/commandsystem/commandsystem.def
diff --git a/plugins/dm.conversation/dm.conversation.def b/plugins/dm.conversation/dm.conversation.def
diff --git a/plugins/dm.difficulty/dm.difficulty.def b/plugins/dm.difficulty/dm.difficulty.def
diff --git a/plugins/dm.editing/dm.editing.def b/plugins/dm.editing/dm.editing.def
diff --git a/plugins/dm.gui/dm.gui.def b/plugins/dm.gui/dm.gui.def
diff --git a/plugins/dm.objectives/dm.objectives.def b/plugins/dm.objectives/dm.objectives.def
diff --git a/plugins/dm.stimresponse/dm.stimresponse.def b/plugins/dm.stimresponse/dm.stimresponse.def
diff --git a/plugins/eclassmgr/eclassmgr.def b/plugins/eclassmgr/eclassmgr.def
diff --git a/plugins/eclasstree/eclasstree.def b/plugins/eclasstree/eclasstree.def
diff --git a/plugins/entity/entity.def b/plugins/entity/entity.def
diff --git a/plugins/entitylist/entitylist.def b/plugins/entitylist/entitylist.def
diff --git a/plugins/eventmanager/eventmanager.def b/plugins/eventmanager/eventmanager.def
diff --git a/plugins/filetypes/filetypes.def b/plugins/filetypes/filetypes.def
diff --git a/plugins/filters/filters.def b/plugins/filters/filters.def
diff --git a/plugins/fonts/fonts.def b/plugins/fonts/fonts.def
diff --git a/plugins/grid/grid.def b/plugins/grid/grid.def
diff --git a/plugins/image/image.def b/plugins/image/image.def
diff --git a/plugins/mapdoom3/mapdoom3.def b/plugins/mapdoom3/mapdoom3.def
diff --git a/plugins/md5model/md5model.def b/plugins/md5model/md5model.def
diff --git a/plugins/model/model.def b/plugins/model/model.def
diff --git a/plugins/particles/particles.def b/plugins/particles/particles.def
diff --git a/plugins/scenegraph/scenegraph.def b/plugins/scenegraph/scenegraph.def
diff --git a/plugins/script/script.def b/plugins/script/script.def
diff --git a/plugins/shaders/shaders.def b/plugins/shaders/shaders.def
diff --git a/plugins/skins/skins.def b/plugins/skins/skins.def
diff --git a/plugins/sound/sound.def b/plugins/sound/sound.def
diff --git a/plugins/uimanager/uimanager.def b/plugins/uimanager/uimanager.def
diff --git a/plugins/undo/undo.def b/plugins/undo/undo.def
diff --git a/plugins/vfspk3/vfspk3.def b/plugins/vfspk3/vfspk3.def
diff --git a/plugins/xmlregistry/xmlregistry.def b/plugins/xmlregistry/xmlregistry.def
diff --git a/radiant/modulesystem/DynamicLibraryLoader.cpp b/radiant/modulesystem/DynamicLibraryLoader.cpp
@@ -10,7 +10,7 @@ namespace module {
 		const char* const SYMBOL_REGISTER_MODULE = "RegisterModule";
 
 		// Modules have to export a symbol of this type, which gets called during DLL loading
-		typedef void (DARKRADIANT_DLLEXPORT *RegisterModulesFunc)(IModuleRegistry& registry);
+		typedef void (*RegisterModulesFunc)(IModuleRegistry& registry);
 	}
 
 DynamicLibraryLoader::DynamicLibraryLoader(DynamicLibraryPtr library,

diff --git a/tools/msvc2015/archivezip.vcxproj b/tools/msvc2015/archivezip.vcxproj
@@ -133,7 +133,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -183,7 +184,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -229,7 +231,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -282,7 +285,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>

diff --git a/tools/msvc2015/commandsystem.vcxproj b/tools/msvc2015/commandsystem.vcxproj
@@ -134,7 +134,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -185,7 +186,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -232,7 +234,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -286,7 +289,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>

diff --git a/tools/msvc2015/dm.conversation.vcxproj b/tools/msvc2015/dm.conversation.vcxproj
@@ -141,7 +141,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -192,7 +193,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -239,7 +241,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -293,7 +296,8 @@
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>$(SolutionDir)/../../plugins/$(ProjectName)/$(ProjectName).def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -340,9 +344,6 @@
     <ClInclude Include="..\..\plugins\dm.conversation\ConversationEntityFinder.h" />
     <ClInclude Include="..\..\plugins\dm.conversation\ConversationKeyExtractor.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\plugins\dm.conversation\dm.conversation.def" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="wxutillib.vcxproj">
       <Project>{b6d4b38a-0c39-42cd-8193-75979e1f4d68}</Project>

diff --git a/tools/msvc2015/dm.conversation.vcxproj.filters b/tools/msvc2015/dm.conversation.vcxproj.filters
@@ -76,9 +76,4 @@
       <Filter>src</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\plugins\dm.conversation\dm.conversation.def">
-      <Filter>src</Filter>
-    </None>
-  </ItemGroup>
 </Project>