diff --git a/Makefile b/Makefile index a1d5430..481ab94 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,10 @@ BUILD_DRIVE := M: MICE := "$(BUILD_DIR)/src\mice.exe" -# VCVARS_32 := "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars32.bat" -# VCVARS_64 := "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat" +# VCVARS := "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars32.bat" # For windows XP: -VCVARS_32 := "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars32.bat" -vcvars_ver=14.16 -VCVARS_64 := "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars64.bat" -vcvars_ver=14.16 +VCVARS := "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\Build\\vcvars32.bat" -vcvars_ver=14.16 .ONESHELL: @@ -20,7 +18,7 @@ all: mice dist mice: -@subst $(BUILD_DRIVE) . @cd /D $(BUILD_DRIVE) \ - & $(VCVARS_32) \ + & $(VCVARS) \ & meson setup --cross cross-32.ini $(BUILD_DRIVE)\$(BUILD_DIR) \ & meson compile -C $(BUILD_DRIVE)\$(BUILD_DIR) @subst $(BUILD_DRIVE) /D diff --git a/src/micetools/dll/hooks/processes.c b/src/micetools/dll/hooks/processes.c index 9b5fe3a..97982f4 100644 --- a/src/micetools/dll/hooks/processes.c +++ b/src/micetools/dll/hooks/processes.c @@ -70,10 +70,10 @@ BOOL WINAPI FakeCreateProcessW(LPCWSTR lpApplicationName, LPWSTR lpCommandLine, // CREATE_NEW_CONSOLE); } else { dwCreationFlags |= CREATE_NEW_CONSOLE; - wsprintfW(commandLineW, L"mice86 -b %ls", lpApplicationName); + wsprintfW(commandLineW, L"mice -b %ls", lpApplicationName); printf("%ls %ls\n", micePathW, commandLineW); BOOL ret = - TrueCreateProcessW(L"mice86.cmd", commandLineW, lpProcessAttributes, lpThreadAttributes, + TrueCreateProcessW(L"mice.cmd", commandLineW, lpProcessAttributes, lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, lpCurrentDirectory, lpStartupInfo, lpProcessInformation); printf("%d\n", ret); diff --git a/src/micetools/lib/mice/config.def b/src/micetools/lib/mice/config.def index 1fa31de..60abfda 100644 --- a/src/micetools/lib/mice/config.def +++ b/src/micetools/lib/mice/config.def @@ -23,7 +23,7 @@ SECTION(launcher, "These options are only used during initial bootstrapping") CFG_str(launcher, game_binary, "", "Override binary detection") CFG_bool(launcher, wait_for_debugger, false, "Wait for a debugger to attach when starting") CFG_int(launcher, startup_delay, 0, "Pause during startup") -CFG_str(launcher, mice_dll, "mice86.dll", "The path to mice's DLL") +CFG_str(launcher, mice_dll, "mice.dll", "The path to mice's DLL") CFG_str(launcher, inject, "", "Extra DLLs to inject during boot") ENDSECTION(launcher) diff --git a/src/micetools/lib/mice/exe.h b/src/micetools/lib/mice/exe.h index f239a03..c76f066 100644 --- a/src/micetools/lib/mice/exe.h +++ b/src/micetools/lib/mice/exe.h @@ -5,10 +5,4 @@ HANDLE start_and_inject(LPCSTR path, LPSTR cmdline, LPCSTR inject, BOOL debug_wait, DWORD delay, LPCSTR extra_injections, DWORD flags); -#ifndef MICELIB -#ifdef MICE_WIN32 -#define MICELIB "mice86.dll" -#else // MICE_WIN32 -#define MICELIB "mice64.dll" -#endif // MICE_WIN32 -#endif // MICELIB +#define MICELIB "mice.dll"