diff --git a/fpc/library/ld.cpp b/fpc/library/ld.cpp index c011c41..11f347f 100644 --- a/fpc/library/ld.cpp +++ b/fpc/library/ld.cpp @@ -25,6 +25,7 @@ CUtlString CLDProject::Link( void ) szFileName = CUtlString("lib%s.so", m_szName.GetString()); break; } + V_printf("%s\n",szFileName.GetString()); CUtlString szTarget = m_target.GetTriplet(); CUtlString szOutputFile = CUtlString("%s/%s/ld/%u_%s/%s",FPC_TEMPORAL_DIRNAME, szTarget.GetString(), hash, m_szName.GetString(), szFileName.GetString()); diff --git a/launcher/__build.cpp b/launcher/__build.cpp index 11c1474..a6a4d01 100644 --- a/launcher/__build.cpp +++ b/launcher/__build.cpp @@ -23,6 +23,7 @@ int launcher_build() } ldProject = compileProject.Compile(); ldProject.linkType = ELINK_EXECUTABLE; + CUtlString szBinaryOutput = CUtlString("%s/bin/funnygame", szOutputDir.GetString()); if (bStaticBuild) { @@ -68,11 +69,12 @@ int launcher_build() ldProject.libraries.AppendTail("oleaut32"); IFileSystem2::CopyFile(CUtlString("%s/bin", szOutputDir.GetString()), "external/windows/libgcc_s_seh-1.dll"); IFileSystem2::CopyFile(CUtlString("%s/bin", szOutputDir.GetString()), "external/windows/libwinpthread-1.dll"); + szBinaryOutput = CUtlString("%s/bin/funnygame.exe", szOutputDir.GetString()); } }; CUtlString outputProject = ldProject.Link(); - IFileSystem2::CopyFile(CUtlString("%s/bin/funnygame", szOutputDir.GetString()), outputProject); + IFileSystem2::CopyFile(szBinaryOutput, outputProject); return 0; }; diff --git a/launcher/launcher.cpp b/launcher/launcher.cpp index 0e4d414..65dfc8c 100644 --- a/launcher/launcher.cpp +++ b/launcher/launcher.cpp @@ -2,9 +2,8 @@ #include "stdio.h" #include "tier0/platform.h" #include "unistd.h" -#include "dlfcn.h" #include "libgen.h" -#include + #ifdef __APPLE__ #include #endif