ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-04 04:04:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix Windows cross-compile build

Browse Source
This commit is contained in:
Joel Dice 2012-12-04 17:37:02 -07:00
parent 2659e32b80
commit 36aa74316a
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
makefile
View File

@ -496,7 +496,7 @@ ifeq ($(platform),windows)
else else
shared += -Wl,--add-stdcall-alias shared += -Wl,--add-stdcall-alias
endif endif
embed = $(build-embed)/embed.exe embed = $(build-embed)/embed.exe
embed-loader = $(build-embed-loader)/embed-loader.exe embed-loader = $(build-embed-loader)/embed-loader.exe
embed-loader-o = $(build-embed)/embed-loader.o embed-loader-o = $(build-embed)/embed-loader.o
@ -1021,13 +1021,13 @@ endif
ifdef embed ifdef embed
$(embed): $(embed-objects) $(embed-loader-o) $(embed): $(embed-objects) $(embed-loader-o)
@echo "building $(embed)" @echo "building $(embed)"
$(build-cxx) $(^) -mwindows -mconsole -static -o $(@) $(cxx) $(^) -mwindows -mconsole -static -o $(@)
$(build-embed)/%.o: $(src)/%.cpp $(build-embed)/%.o: $(src)/%.cpp
@echo "compiling $(@)" @echo "compiling $(@)"
@mkdir -p $(dir $(@)) @mkdir -p $(dir $(@))
$(build-cxx) -D_UNICODE -DUNICODE -c $(<) -o $(@) $(cxx) -D_UNICODE -DUNICODE -c $(<) -o $(@)
$(embed-loader-o): $(embed-loader) $(converter) $(embed-loader-o): $(embed-loader) $(converter)
@mkdir -p $(dir $(@)) @mkdir -p $(dir $(@))
$(converter) $(<) $(@) _binary_loader_start \ $(converter) $(<) $(@) _binary_loader_start \
@ -1047,7 +1047,6 @@ $(build-embed-loader)/%.o: $(src)/%.cpp
@mkdir -p $(dir $(@)) @mkdir -p $(dir $(@))
$(cxx) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/win32 \ $(cxx) -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/win32 \
-D_JNI_IMPLEMENTATION_ -c $(<) -o $(@) -D_JNI_IMPLEMENTATION_ -c $(<) -o $(@)
endif endif
$(build)/%.o: $(lzma)/C/%.c $(build)/%.o: $(lzma)/C/%.c

2
src/embed.cpp
View File

@ -8,7 +8,7 @@
There is NO WARRANTY for this software. See license.txt for There is NO WARRANTY for this software. See license.txt for
details. */ details. */
#include <Windows.h> #include <windows.h>
#include <tchar.h> #include <tchar.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>

4
src/embedded-loader.cpp
View File

@ -8,7 +8,7 @@
There is NO WARRANTY for this software. See license.txt for There is NO WARRANTY for this software. See license.txt for
details. */ details. */
#include <Windows.h> #include <windows.h>
#include <tchar.h> #include <tchar.h>
#include <stdint.h> #include <stdint.h>
@ -102,4 +102,4 @@ main(int ac, const char** av)
vm->DestroyJavaVM(); vm->DestroyJavaVM();
return exitCode; return exitCode;
} }