Skip to content

Commit

Permalink
force CI rebuild
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <[email protected]>
  • Loading branch information
falkTX committed Mar 14, 2024
1 parent cde2172 commit 80b684a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: build
on: [push, pull_request]

env:
CACHE_VERSION_LINUX: 24
CACHE_VERSION_MACOS: 20
CACHE_VERSION_WIN64: 19
CACHE_VERSION_LINUX: 25
CACHE_VERSION_MACOS: 25
CACHE_VERSION_WIN64: 25
DEBIAN_FRONTEND: noninteractive
HOMEBREW_NO_AUTO_UPDATE: 1
PAWPAW_FAST_MATH: 1
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ TARGETS += $(foreach PLUGIN,$(PLUGINS),$(call PLUGIN_STAMP,$(PLUGIN)))
# ---------------------------------------------------------------------------------------------------------------------

all: $(TARGETS)
$(MAKE) -C src/plugin
./utils/run.sh $(PAWPAW_TARGET) $(MAKE) -C src/plugin

clean:
$(MAKE) clean -C src/DPF
Expand Down
8 changes: 6 additions & 2 deletions src/plugin/ChildProcess.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,11 @@ class ChildProcess
stop();
}

#ifdef _WIN32
bool start(const char* const args[], const WCHAR* const envp)
#else
bool start(const char* const args[], char* const* const envp = nullptr)
#endif
{
#ifdef _WIN32
std::string cmd;
Expand All @@ -70,8 +74,8 @@ class ChildProcess
nullptr, // lpProcessAttributes
nullptr, // lpThreadAttributes
TRUE, // bInheritHandles
0, // CREATE_NO_WINDOW /*| CREATE_UNICODE_ENVIRONMENT*/, // dwCreationFlags
const_cast<LPSTR>(envp), // lpEnvironment
/* CREATE_NO_WINDOW | */ CREATE_UNICODE_ENVIRONMENT, // dwCreationFlags
const_cast<LPWSTR>(envp), // lpEnvironment
nullptr, // lpCurrentDirectory
&si, // lpStartupInfo
&process) != FALSE;
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/DesktopUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class DesktopUI : public UI,
}
}

void buttonClicked(SubWidget* const widget, int button) override
void buttonClicked(SubWidget* const widget, int) override
{
switch (widget->getId())
{
Expand Down
4 changes: 4 additions & 0 deletions src/plugin/utils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ const char* getAppDir();

/* Get environment to be used for a child process.
*/
#ifdef _WIN32
const WCHAR* getEvironment(uint portBaseNum);
#else
char* const* getEvironment(uint portBaseNum);
#endif

/* Open a web browser with the mod-ui URL as address.
*/
Expand Down

0 comments on commit 80b684a

Please sign in to comment.