mirror of https://github.com/BOINC/boinc.git
VBOX: Begin refactoring for supporting the native VirtualBox API set on Windows. Use the code in the deprecated directory as a baseline.
This commit is contained in:
parent
f37336a956
commit
557c15dbf0
|
@ -32,5 +32,8 @@ floppyio.o: floppyio.cpp
|
|||
vbox.o: vbox.cpp
|
||||
g++ $(CXXFLAGS) -c vbox.cpp
|
||||
|
||||
vboxwrapper: vboxwrapper.o vbox.o floppyio.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
|
||||
g++ $(CXXFLAGS) -o vboxwrapper vboxwrapper.o vbox.o floppyio.o libstdc++.a -pthread -lboinc_api -lboinc
|
||||
vbox_unix.o: vbox_unix.cpp
|
||||
g++ $(CXXFLAGS) -c vbox_unix.cpp
|
||||
|
||||
vboxwrapper: vboxwrapper.o vbox.o vbox_unix.o floppyio.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
|
||||
g++ $(CXXFLAGS) -o vboxwrapper vboxwrapper.o vbox.o vbox_unix.o floppyio.o libstdc++.a -pthread -lboinc_api -lboinc
|
||||
|
|
|
@ -24,6 +24,7 @@ CXXFLAGS = $(VARIANTFLAGS) \
|
|||
OBJ = \
|
||||
floppyio.o \
|
||||
vbox.o \
|
||||
vbox_unix.o \
|
||||
vboxwrapper.o
|
||||
|
||||
PROGS = vboxwrapper
|
||||
|
@ -39,5 +40,8 @@ floppyio.o: floppyio.cpp
|
|||
vbox.o: vbox.cpp
|
||||
$(CXX) $(CXXFLAGS) -c vbox.cpp
|
||||
|
||||
vboxwrapper: vboxwrapper.o vbox.o floppyio.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_api.a
|
||||
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o vboxwrapper vboxwrapper.o vbox.o floppyio.o -pthread -lboinc_api -lboinc
|
||||
vbox_unix.o: vbox_unix.cpp
|
||||
$(CXX) $(CXXFLAGS) -c vbox_unix.cpp
|
||||
|
||||
vboxwrapper: vboxwrapper.o vbox.o vbox_unix.o floppyio.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_api.a
|
||||
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o vboxwrapper vboxwrapper.o vbox.o vbox_unix.o floppyio.o -pthread -lboinc_api -lboinc
|
||||
|
|
|
@ -287,6 +287,7 @@ public:
|
|||
|
||||
void sanitize_output(std::string& output);
|
||||
|
||||
#ifndef _WIN32
|
||||
int vbm_popen(
|
||||
std::string& command, std::string& output, const char* item, bool log_error = true, bool retry_failures = true, unsigned int timeout = 45, bool log_trace = true
|
||||
);
|
||||
|
@ -299,6 +300,7 @@ public:
|
|||
void vbm_trace(
|
||||
std::string& command, std::string& ouput, int retval
|
||||
);
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -290,6 +290,7 @@
|
|||
<ClCompile Include="..\samples\vboxwrapper\mscom\VirtualBox_i.c" />
|
||||
<ClCompile Include="..\samples\vboxwrapper\vbox.cpp" />
|
||||
<ClCompile Include="..\samples\vboxwrapper\vboxwrapper.cpp" />
|
||||
<ClCompile Include="..\samples\vboxwrapper\vbox_win.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\samples\vboxwrapper\floppyio.h" />
|
||||
|
|
Loading…
Reference in New Issue