Skip to content

Commit

Permalink
Split off our interface to SDL input out to disdlinput.dll/so/lib and…
Browse files Browse the repository at this point in the history
… added a di* lib loader under *nix.
  • Loading branch information
danij committed Mar 18, 2008
1 parent f06bff6 commit ef866e9
Show file tree
Hide file tree
Showing 10 changed files with 836 additions and 81 deletions.
2 changes: 2 additions & 0 deletions doomsday/build/win32/disdlinput_cl.rsp
@@ -0,0 +1,2 @@
./../../plugins/disdlinput/src/driver_disdlinput.cpp

13 changes: 11 additions & 2 deletions doomsday/build/win32/vcbuild.bat
Expand Up @@ -99,7 +99,7 @@ GOTO Done

:: *** Cleanup and build all targets.
:All
CALL vcbuild.bat cleanup copydll res dmt doomsday dpdehread wadMapConverter dssdlmixer dscompat didinput8 jdoom jheretic jhexen wolftc jdoom64
CALL vcbuild.bat cleanup copydll res dmt doomsday dpdehread wadMapConverter dssdlmixer dscompat didinput8 disdlinput jdoom jheretic jhexen wolftc jdoom64
GOTO Done


Expand Down Expand Up @@ -168,7 +168,7 @@ GOTO DONE
:Doomsday
CALL vcbuild.bat checkdmt
ECHO Compiling Doomsday.exe (Engine)...
cl %FLAGS% %INCS% %INCS_ENGINE_WIN32% /I "%GL_INC%" %INCS_ENGINE_PORTABLE% %INCS_LZSS_PORTABLE% %INCS_LIBPNG_PORTABLE% %INCS_LIBCURL% %INCS_ZLIB% %INCS_PLUGIN_COMMON% %DEFINES% %DEBUGDEFINES% %PROFILEDEFINES% /D "__DOOMSDAY__" ./%OBJ_DIR%/doomsday_res.obj @doomsday_cl.rsp /link /OUT:"./%BIN_DIR%/Doomsday.exe" /DEF:"./../../engine/api/doomsday.def" /IMPLIB:"./%BIN_DIR%/Doomsday.lib" %LFLAGS% %LIBS% %EXTERNAL%/libpng/win32/libpng13.lib %EXTERNAL%/zlib/win32/zlib1.lib %EXTERNAL%/lzss/win32/lzss.lib %EXTERNAL%/libcurl/win32/curllib.lib sdl_net.lib sdl.lib wsock32.lib dinput8.lib dsound.lib eaxguid.lib dxguid.lib winmm.lib opengl32.lib glu32.lib kernel32.lib gdi32.lib ole32.lib user32.lib
cl %FLAGS% %INCS% %INCS_ENGINE_WIN32% /I "%GL_INC%" %INCS_ENGINE_PORTABLE% %INCS_LZSS_PORTABLE% %INCS_LIBPNG_PORTABLE% %INCS_LIBCURL% %INCS_ZLIB% %INCS_PLUGIN_COMMON% %DEFINES% %DEBUGDEFINES% %PROFILEDEFINES% /D "__DOOMSDAY__" ./%OBJ_DIR%/doomsday_res.obj @doomsday_cl.rsp /link /OUT:"./%BIN_DIR%/Doomsday.exe" /DEF:"./../../engine/api/doomsday.def" /IMPLIB:"./%BIN_DIR%/Doomsday.lib" %LFLAGS% %LIBS% %EXTERNAL%/libpng/win32/libpng13.lib %EXTERNAL%/zlib/win32/zlib1.lib %EXTERNAL%/lzss/win32/lzss.lib %EXTERNAL%/libcurl/win32/curllib.lib sdl_net.lib sdl.lib wsock32.lib dsound.lib eaxguid.lib dxguid.lib winmm.lib opengl32.lib glu32.lib kernel32.lib gdi32.lib ole32.lib user32.lib
IF %ERRORLEVEL% == 0 GOTO Done
GOTO Failure

Expand Down Expand Up @@ -227,6 +227,15 @@ IF %ERRORLEVEL% == 0 GOTO Done
GOTO Failure


:: *** diSDLInput.dll
:diSDLInput
ECHO Compiling diSDLInput.dll (SDL_Input Input driver)...
md %OBJ_DIR%\diSDLInput
cl /O2 /Ob1 %INCS% %DLLDEFINES% /D "DISDLINPUT_EXPORTS" /GF /FD /EHsc /MT /Gy /Fo"./%OBJ_DIR%/diSDLInput" /Fd"./%OBJ_DIR%/diSDLInput" /W3 /Gd @disdlinput_cl.rsp /link /OUT:"./%BIN_DIR%/diSDLInput.dll" %LFLAGS% /DLL /DEF:"./../../plugins/disdlinput/api/diSDLInput.def" /IMPLIB:"./%BIN_DIR%/diSDLInput.lib" %LIBS% sdl.lib ./%BIN_DIR%/doomsday.lib
IF %ERRORLEVEL% == 0 GOTO Done
GOTO Failure


:: *** dpWadMapConverter.dll
:wadMapConverter
ECHO Compiling dpWadMapConverter.dll (WAD Map converter plugin)...
Expand Down
237 changes: 237 additions & 0 deletions doomsday/build/win32/vs8/disdlinput.vcproj
@@ -0,0 +1,237 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="diSDLInput"
ProjectGUID="{A80D4CA6-89BE-4933-B443-7AA5F4A5C316}"
RootNamespace="diSDLInput"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\./Bin/Debug"
IntermediateDirectory=".\./Obj/Debug"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\./Bin/Debug/diSDLInput.tlb"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\engine\api"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DIDINPUT8_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\./Obj/Debug/diSDLInput.pch"
AssemblerListingLocation=".\./Obj/Debug/"
ObjectFile=".\./Obj/Debug/"
ProgramDataBaseFileName=".\./Obj/Debug/"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1035"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="sdl.lib ./bin/debug/doomsday.lib"
OutputFile=".\./Bin/Debug/diSDLInput.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\plugins\disdlinput\api\diSDLInput.def"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./Bin/Debug/diSDLInput.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary=".\./Bin/Debug/diSDLInput.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\./Bin/Release"
IntermediateDirectory=".\./Obj/Release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\./Bin/Release/diSDLInput.tlb"
/>
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\engine\api"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DIDINPUT8_EXPORTS"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\./Obj/Release/diSDLInput.pch"
AssemblerListingLocation=".\./Obj/Release/"
ObjectFile=".\./Obj/Release/"
ProgramDataBaseFileName=".\./Obj/Release/"
WarningLevel="3"
SuppressStartupBanner="true"
CallingConvention="0"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1035"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="sdl.lib ./bin/release/doomsday.lib"
OutputFile=".\./Bin/Release/diSDLInput.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ModuleDefinitionFile="..\..\..\plugins\disdlinput\api\diSDLInput.def"
ProgramDatabaseFile=".\./Bin/Release/diSDLInput.pdb"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary=".\./Bin/Release/diSDLInput.lib"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\..\plugins\disdlinput\src\driver_disdlinput.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
</Filter>
<Filter
Name="Resource Files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
</Filter>
<File
RelativePath="..\..\..\plugins\disdlinput\api\disdlinput.def"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
8 changes: 8 additions & 0 deletions doomsday/build/win32/vs8/doomsday.sln
Expand Up @@ -64,6 +64,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dpWadMapConverter", "dpwadm
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diDInput8", "didinput8.vcproj", "{175ADED7-8B57-44C5-98F4-B6BEBFA5E2F5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diSDLInput", "disdlinput.vcproj", "{A80D4CA6-89BE-4933-B443-7AA5F4A5C316}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -154,6 +156,12 @@ Global
{175ADED7-8B57-44C5-98F4-B6BEBFA5E2F5}.Mesa Release|Win32.Build.0 = Release|Win32
{175ADED7-8B57-44C5-98F4-B6BEBFA5E2F5}.Release|Win32.ActiveCfg = Release|Win32
{175ADED7-8B57-44C5-98F4-B6BEBFA5E2F5}.Release|Win32.Build.0 = Release|Win32
{A80D4CA6-89BE-4933-B443-7AA5F4A5C316}.Debug|Win32.ActiveCfg = Debug|Win32
{A80D4CA6-89BE-4933-B443-7AA5F4A5C316}.Debug|Win32.Build.0 = Debug|Win32
{A80D4CA6-89BE-4933-B443-7AA5F4A5C316}.Mesa Release|Win32.ActiveCfg = Release|Win32
{A80D4CA6-89BE-4933-B443-7AA5F4A5C316}.Mesa Release|Win32.Build.0 = Release|Win32
{A80D4CA6-89BE-4933-B443-7AA5F4A5C316}.Release|Win32.ActiveCfg = Release|Win32
{A80D4CA6-89BE-4933-B443-7AA5F4A5C316}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
6 changes: 1 addition & 5 deletions doomsday/build/win32/vs8/doomsday.vcproj
Expand Up @@ -1114,16 +1114,14 @@
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\engine\unix\src\sys_input.c"
RelativePath="..\..\..\engine\unix\src\sys_inputd_loader.c"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Expand All @@ -1132,8 +1130,6 @@
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
Expand Down

0 comments on commit ef866e9

Please sign in to comment.