Browse Source

Fixes compilation of efsw on Windows.

pull/72/head
Leonardo Laguna Ruiz Leonardo 2 years ago
parent
commit
96d6305e89
2 changed files with 12 additions and 2 deletions
  1. +11
    -1
      Makefile
  2. +1
    -1
      src/Prototype.cpp

+ 11
- 1
Makefile View File

@@ -38,14 +38,24 @@ ifeq (, $(shell which premake4))
else
PREMAKE = premake4
endif
efsw := dep/lib/libefsw-static-release.a
ifdef ARCH_WIN
efsw := dep/lib/efsw-static-release.lib
else
efsw := dep/lib/libefsw-static-release.a
endif
DEPS += $(efsw)
OBJECTS += $(efsw)
$(efsw):
cd efsw && $(PREMAKE) gmake
ifdef ARCH_WIN
cd efsw && $(MAKE) -C make/* config=release_x86_64 efsw-static-lib
mkdir -p dep/lib dep/include
cd efsw && cp lib/efsw-static-release.lib $(DEP_PATH)/lib/
else
cd efsw && $(MAKE) -C make/* config=release efsw-static-lib
mkdir -p dep/lib dep/include
cd efsw && cp lib/libefsw-static-release.a $(DEP_PATH)/lib/
endif
cd efsw && cp -R include/efsw $(DEP_PATH)/include/




+ 1
- 1
src/Prototype.cpp View File

@@ -504,7 +504,7 @@ struct Prototype : Module {
(void) std::system(command.c_str());
#elif defined ARCH_WIN
std::string command = editorPath + " \"" + path + "\"";
std::wstring commandW = string::toWstring(command);
std::wstring commandW = string::UTF8toUTF16(command);
STARTUPINFOW startupInfo;
std::memset(&startupInfo, 0, sizeof(startupInfo));
startupInfo.cb = sizeof(startupInfo);


Loading…
Cancel
Save