Skip to content

Commit

Permalink
Fixed relative paths in the codeblocks project files. Changed doomsda…
Browse files Browse the repository at this point in the history
…y.lib include path to include the output target folder for each target build (e.g. search Debug Win32 when linking a Debug Win32 build of jDoom).

I can now build and run Doomsday using the Visual C++2005/2008 compiler from within codeblocks and use EDITANDCONTINUE when the build target is Debug Win32.
  • Loading branch information
danij committed Mar 17, 2008
1 parent 4b1fc17 commit 1bb5ec9
Show file tree
Hide file tree
Showing 14 changed files with 1,370 additions and 1,372 deletions.
836 changes: 418 additions & 418 deletions doomsday/build/codeblocks/doomsday.cbp

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions doomsday/build/codeblocks/doomsday.workspace
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
<Workspace title="deng project">
<Project filename="doomsday.cbp" />
<Project filename="jdoom.cbp" active="1" />
<Project filename="doomsday.cbp" active="1" />
<Project filename="jdoom.cbp" />
<Project filename="jdoom64.cbp" />
<Project filename="jheretic.cbp" />
<Project filename="jhexen.cbp" />
Expand Down
18 changes: 9 additions & 9 deletions doomsday/build/codeblocks/dpdehread.cbp
Expand Up @@ -8,7 +8,7 @@
<Build>
<Target title="Release Win32">
<Option platforms="Windows;" />
<Option output="dpDehRead" prefix_auto="1" extension_auto="1" />
<Option output="bin\Release Win32\dpDehRead" prefix_auto="1" extension_auto="1" />
<Option object_output=".\Obj\Release Win32\dpDehRead" />
<Option type="3" />
<Option compiler="msvc8" />
Expand All @@ -23,19 +23,19 @@
<Add option="/D_WINDOWS" />
<Add option="/D_USRDLL" />
<Add option="/DDPDEHREAD_EXPORTS" />
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</Compiler>
<ResourceCompiler>
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</ResourceCompiler>
<Linker>
<Add option="/INCREMENTAL:NO" />
<Add library="doomsday" />
<Add library="bin\Release Win32\Doomsday.lib" />
</Linker>
</Target>
<Target title="Debug Win32">
<Option platforms="Windows;" />
<Option output="dpDehRead" prefix_auto="1" extension_auto="1" />
<Option output="bin\Debug Win32\dpDehRead" prefix_auto="1" extension_auto="1" />
<Option object_output=".\Obj\Debug Win32\dpDehRead" />
<Option type="3" />
<Option compiler="msvc8" />
Expand All @@ -52,19 +52,19 @@
<Add option="/D_WINDOWS" />
<Add option="/D_USRDLL" />
<Add option="/DDPDEHREAD_EXPORTS" />
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</Compiler>
<ResourceCompiler>
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</ResourceCompiler>
<Linker>
<Add option="/opt:noicf" />
<Add option="/opt:noref" />
<Add library="doomsday" />
<Add library="bin\Debug Win32\Doomsday.lib" />
</Linker>
</Target>
</Build>
<Unit filename="..\..\..\plugins\dehread\src\dehmain.c">
<Unit filename="..\..\plugins\dehread\src\dehmain.c">
<Option compilerVar="CC" />
</Unit>
<Extensions>
Expand Down
18 changes: 9 additions & 9 deletions doomsday/build/codeblocks/dpexample.cbp
Expand Up @@ -8,7 +8,7 @@
<Build>
<Target title="Release Win32">
<Option platforms="Windows;" />
<Option output="dpExample" prefix_auto="1" extension_auto="1" />
<Option output="bin\Release Win32\dpExample" prefix_auto="1" extension_auto="1" />
<Option object_output=".\Obj\Release Win32\dpExample" />
<Option type="3" />
<Option compiler="msvc8" />
Expand All @@ -24,19 +24,19 @@
<Add option="/D_WINDOWS" />
<Add option="/D_USRDLL" />
<Add option="/DDPEXAMPLE_EXPORTS" />
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</Compiler>
<ResourceCompiler>
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</ResourceCompiler>
<Linker>
<Add option="/INCREMENTAL:NO" />
<Add library="doomsday" />
<Add library="bin\Release Win32\Doomsday.lib" />
</Linker>
</Target>
<Target title="Debug Win32">
<Option platforms="Windows;" />
<Option output="dpExample" prefix_auto="1" extension_auto="1" />
<Option output="bin\Debug Win32\dpExample" prefix_auto="1" extension_auto="1" />
<Option object_output=".\Obj\Debug Win32\dpExample" />
<Option type="3" />
<Option compiler="msvc8" />
Expand All @@ -54,19 +54,19 @@
<Add option="/D_WINDOWS" />
<Add option="/D_USRDLL" />
<Add option="/DDPEXAMPLE_EXPORTS" />
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</Compiler>
<ResourceCompiler>
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</ResourceCompiler>
<Linker>
<Add option="/opt:noicf" />
<Add option="/opt:noref" />
<Add library="doomsday" />
<Add library="bin\Debug Win32\Doomsday.lib" />
</Linker>
</Target>
</Build>
<Unit filename="..\..\..\plugins\exampleplugin\src\example.c">
<Unit filename="..\..\plugins\exampleplugin\src\example.c">
<Option compilerVar="CC" />
</Unit>
<Extensions>
Expand Down
30 changes: 15 additions & 15 deletions doomsday/build/codeblocks/dpwadmapconverter.cbp
Expand Up @@ -8,7 +8,7 @@
<Build>
<Target title="Debug Win32">
<Option platforms="Windows;" />
<Option output="dpWadMapConverter" prefix_auto="1" extension_auto="1" />
<Option output="bin\Debug Win32\dpWadMapConverter" prefix_auto="1" extension_auto="1" />
<Option object_output=".\Obj\Debug Win32\dpWadMapConverter" />
<Option type="3" />
<Option compiler="msvc8" />
Expand All @@ -26,22 +26,22 @@
<Add option="/D_WINDOWS" />
<Add option="/D_USRDLL" />
<Add option="/DDPWADMAPCONVERTER_EXPORTS" />
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\..\plugins\wadmapconverter\include" />
<Add directory="..\..\engine\api" />
<Add directory="..\..\plugins\wadmapconverter\include" />
</Compiler>
<ResourceCompiler>
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\..\plugins\wadmapconverter\include" />
<Add directory="..\..\engine\api" />
<Add directory="..\..\plugins\wadmapconverter\include" />
</ResourceCompiler>
<Linker>
<Add option="/opt:noicf" />
<Add option="/opt:noref" />
<Add library="doomsday" />
<Add library="bin\Debug Win32\Doomsday.lib" />
</Linker>
</Target>
<Target title="Release Win32">
<Option platforms="Windows;" />
<Option output="dpWadMapConverter" prefix_auto="1" extension_auto="1" />
<Option output="bin\Release Win32\dpWadMapConverter" prefix_auto="1" extension_auto="1" />
<Option object_output=".\Obj\Release Win32\dpWadMapConverter" />
<Option type="3" />
<Option compiler="msvc8" />
Expand All @@ -57,24 +57,24 @@
<Add option="/D_WINDOWS" />
<Add option="/D_USRDLL" />
<Add option="/DDPWADMAPCONVERTER_EXPORTS" />
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\..\plugins\wadmapconverter\include" />
<Add directory="..\..\engine\api" />
<Add directory="..\..\plugins\wadmapconverter\include" />
</Compiler>
<ResourceCompiler>
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\..\plugins\wadmapconverter\include" />
<Add directory="..\..\engine\api" />
<Add directory="..\..\plugins\wadmapconverter\include" />
</ResourceCompiler>
<Linker>
<Add option="/INCREMENTAL:NO" />
<Add library="doomsday" />
<Add library="bin\Release Win32\Doomsday.lib" />
</Linker>
</Target>
</Build>
<Unit filename="..\..\..\plugins\wadmapconverter\include\wadmapconverter.h" />
<Unit filename="..\..\..\plugins\wadmapconverter\src\load.c">
<Unit filename="..\..\plugins\wadmapconverter\include\wadmapconverter.h" />
<Unit filename="..\..\plugins\wadmapconverter\src\load.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\..\plugins\wadmapconverter\src\wadmapconverter.c">
<Unit filename="..\..\plugins\wadmapconverter\src\wadmapconverter.c">
<Option compilerVar="CC" />
</Unit>
<Extensions>
Expand Down
24 changes: 12 additions & 12 deletions doomsday/build/codeblocks/dsa3d.cbp
Expand Up @@ -8,7 +8,7 @@
<Build>
<Target title="Debug Win32">
<Option platforms="Windows;" />
<Option output="dsA3D" prefix_auto="1" extension_auto="1" />
<Option output="bin\Debug Win32\dsA3D" prefix_auto="1" extension_auto="1" />
<Option object_output=".\Obj\Debug Win32\dsA3D" />
<Option type="3" />
<Option compiler="msvc8" />
Expand All @@ -24,23 +24,23 @@
<Add option="/D_WINDOWS" />
<Add option="/D_USRDLL" />
<Add option="/DDSA3D_EXPORTS" />
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</Compiler>
<ResourceCompiler>
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</ResourceCompiler>
<Linker>
<Add option='/DEF:&quot;..\..\..\plugins\a3d\api\dsA3d.def&quot;' />
<Add option='/DEF:&quot;..\..\plugins\a3d\api\dsA3d.def&quot;' />
<Add option="/opt:noicf" />
<Add option="/opt:noref" />
<Add library="doomsday" />
<Add library="bin\Debug Win32\Doomsday.lib" />
<Add library="ia3dutild" />
<Add library="ole32" />
</Linker>
</Target>
<Target title="Release Win32">
<Option platforms="Windows;" />
<Option output="dsA3D" prefix_auto="1" extension_auto="1" />
<Option output="bin\Release Win32\dsA3D" prefix_auto="1" extension_auto="1" />
<Option object_output=".\Obj\Release Win32\dsA3D" />
<Option type="3" />
<Option compiler="msvc8" />
Expand All @@ -55,22 +55,22 @@
<Add option="/D_WINDOWS" />
<Add option="/D_USRDLL" />
<Add option="/DDSA3D_EXPORTS" />
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</Compiler>
<ResourceCompiler>
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</ResourceCompiler>
<Linker>
<Add option='/DEF:&quot;..\..\..\plugins\a3d\api\dsA3d.def&quot;' />
<Add option='/DEF:&quot;..\..\plugins\a3d\api\dsA3d.def&quot;' />
<Add option="/INCREMENTAL:NO" />
<Add library="doomsday" />
<Add library="bin\Release Win32\Doomsday.lib" />
<Add library="ia3dutil" />
<Add library="ole32" />
</Linker>
</Target>
</Build>
<Unit filename="..\..\..\plugins\a3d\api\dsa3d.def" />
<Unit filename="..\..\..\plugins\a3d\src\driver_a3d.cpp" />
<Unit filename="..\..\plugins\a3d\api\dsa3d.def" />
<Unit filename="..\..\plugins\a3d\src\driver_a3d.cpp" />
<Extensions>
<code_completion />
<debugger />
Expand Down
24 changes: 12 additions & 12 deletions doomsday/build/codeblocks/dscompat.cbp
Expand Up @@ -8,7 +8,7 @@
<Build>
<Target title="Debug Win32">
<Option platforms="Windows;" />
<Option output="dsCompat" prefix_auto="1" extension_auto="1" />
<Option output="bin\Debug Win32\dsCompat" prefix_auto="1" extension_auto="1" />
<Option object_output=".\Obj\Debug Win32\dsCompat" />
<Option type="3" />
<Option compiler="msvc8" />
Expand All @@ -24,16 +24,16 @@
<Add option="/D_WINDOWS" />
<Add option="/D_USRDLL" />
<Add option="/DDSCOMPAT_EXPORTS" />
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</Compiler>
<ResourceCompiler>
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</ResourceCompiler>
<Linker>
<Add option='/DEF:&quot;..\..\..\plugins\ds6\api\dsCompat.def&quot;' />
<Add option='/DEF:&quot;..\..\plugins\ds6\api\dsCompat.def&quot;' />
<Add option="/opt:noicf" />
<Add option="/opt:noref" />
<Add library="doomsday" />
<Add library="bin\Debug Win32\Doomsday.lib" />
<Add library="eax" />
<Add library="eaxguid" />
<Add library="dsound" />
Expand All @@ -42,7 +42,7 @@
</Target>
<Target title="Release Win32">
<Option platforms="Windows;" />
<Option output="dsCompat" prefix_auto="1" extension_auto="1" />
<Option output="bin\Release Win32\dsCompat" prefix_auto="1" extension_auto="1" />
<Option object_output=".\Obj\Release Win32\dsCompat" />
<Option type="3" />
<Option compiler="msvc8" />
Expand All @@ -57,24 +57,24 @@
<Add option="/D_WINDOWS" />
<Add option="/D_USRDLL" />
<Add option="/DDSCOMPAT_EXPORTS" />
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</Compiler>
<ResourceCompiler>
<Add directory="..\..\..\engine\api" />
<Add directory="..\..\engine\api" />
</ResourceCompiler>
<Linker>
<Add option='/DEF:&quot;..\..\..\plugins\ds6\api\dsCompat.def&quot;' />
<Add option='/DEF:&quot;..\..\plugins\ds6\api\dsCompat.def&quot;' />
<Add option="/INCREMENTAL:NO" />
<Add library="doomsday" />
<Add library="bin\Release Win32\Doomsday.lib" />
<Add library="eax" />
<Add library="eaxguid" />
<Add library="dsound" />
<Add library="dxguid" />
</Linker>
</Target>
</Build>
<Unit filename="..\..\..\plugins\ds6\api\dscompat.def" />
<Unit filename="..\..\..\plugins\ds6\src\driver_sndcmp.cpp" />
<Unit filename="..\..\plugins\ds6\api\dscompat.def" />
<Unit filename="..\..\plugins\ds6\src\driver_sndcmp.cpp" />
<Extensions>
<code_completion />
<debugger />
Expand Down

0 comments on commit 1bb5ec9

Please sign in to comment.