diff --git a/.gitignore b/.gitignore index 76671817..6597f9a9 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ *.exe *.out *.app +!ducible.exe # NetBeans nbproject/private/ diff --git a/action.yml b/action.yml index 44461794..91275e25 100644 --- a/action.yml +++ b/action.yml @@ -106,7 +106,7 @@ runs: echo ::group::Build ReleaseXP # - echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd" + # echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd" "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/sfall/ddraw.sln" -p:Configuration=ReleaseXP -p:Platform=Win32 -p:PlatformToolset=v140_xp # echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/ReleaseXP/ddraw.dll")" >> $GITHUB_OUTPUT @@ -126,7 +126,7 @@ runs: echo "::group::Build DevXP" # - echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd" + # echo "@echo off" > "$GITHUB_ACTION_PATH/sfall/PostBuild.cmd" "${{ steps.msbuild.outputs.exe }}" "$GITHUB_ACTION_PATH/sfall/ddraw.sln" -p:Configuration=DevXP -p:Platform=Win32 -p:PlatformToolset=v140_xp # echo "ddraw-dll=$(cygpath --windows "$GITHUB_ACTION_PATH/sfall/DevXP/ddraw.dll")" >> $GITHUB_OUTPUT diff --git a/sfall/Modules/Interface.cpp b/sfall/Modules/Interface.cpp index 19084d42..ba00ee1a 100644 --- a/sfall/Modules/Interface.cpp +++ b/sfall/Modules/Interface.cpp @@ -599,7 +599,7 @@ static void AddNewDot() { } static void __declspec(naked) DrawingDots() noexcept { - long x_offset, y_offset; + long x_offset, y_offset; __asm { mov ebp, esp; // prolog sub esp, __LOCAL_SIZE; diff --git a/sfall/ducible.exe b/sfall/ducible.exe new file mode 100644 index 00000000..ed53db16 Binary files /dev/null and b/sfall/ducible.exe differ diff --git a/sfall/postbuild.cmd b/sfall/postbuild.cmd new file mode 100644 index 00000000..92f45817 --- /dev/null +++ b/sfall/postbuild.cmd @@ -0,0 +1,21 @@ +@ECHO OFF + +rem debug, release, etc. +SET type=%1 +rem full path to the compiled DLL +SET target=%2 + +SET destination=C:\Games\Fallout2\ddraw.dll + +SET pdb="%~dpn2.pdb" + +IF EXIST ducible.exe ( + IF EXIST %pdb% ( + ducible %target% %pdb% + ) ELSE ( + ducible %target% + ) +) + +rem echo Copying %target% to %destination% ... +rem copy %target% %destination% \ No newline at end of file diff --git a/sfall/postbuild.cmd.template b/sfall/postbuild.cmd.template index 9465d3ca..09c573bc 100644 --- a/sfall/postbuild.cmd.template +++ b/sfall/postbuild.cmd.template @@ -7,5 +7,15 @@ SET target=%2 SET destination=d:\GAMES\Fallout2\@RP\ddraw.dll +SET pdb="%~dpn2.pdb" + +IF EXIST ducible.exe ( + IF EXIST %pdb% ( + ducible %target% %pdb% + ) ELSE ( + ducible %target% + ) +) + echo Copying %target% to %destination% ... copy %target% %destination% \ No newline at end of file