suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vrclient: Fix building with winemaker

Browse source
This commit is contained in:
Andrew Eikum 2018-01-18 13:31:32 -06:00
parent a89b44235a
commit 9982ade529
20 changed files with 6 additions and 225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
vrclient_x64/Makefile.in
View file

@ -1,125 +0,0 @@
MODULE = vrclient_x64.dll
EXTRADEFS = -Wno-unused-variable -Wno-attributes -DGNUC
CPPFLAGS = -std=c++0x
C_SRCS = \
vrclient_main.c \
winIVRSystem.c \
winIVRApplications.c \
winIVRSettings.c \
winIVRChaperone.c \
winIVRChaperoneSetup.c \
winIVRCompositor.c \
winIVRNotifications.c \
winIVROverlay.c \
winIVRRenderModels.c \
winIVRExtendedDisplay.c \
winIVRTrackedCamera.c \
winIVRScreenshots.c \
winIVRResources.c \
winIVRDriverManager.c \
winIVRClientCore.c \
CPP_SRCS = \
struct_converters_1011.cpp \
cppIVRSystem_IVRSystem_017.cpp \
cppIVRApplications_IVRApplications_006.cpp \
cppIVRSettings_IVRSettings_002.cpp \
cppIVRChaperone_IVRChaperone_003.cpp \
cppIVRChaperoneSetup_IVRChaperoneSetup_005.cpp \
cppIVRCompositor_IVRCompositor_022.cpp \
cppIVRNotifications_IVRNotifications_002.cpp \
cppIVROverlay_IVROverlay_017.cpp \
cppIVRRenderModels_IVRRenderModels_005.cpp \
cppIVRExtendedDisplay_IVRExtendedDisplay_001.cpp \
cppIVRTrackedCamera_IVRTrackedCamera_003.cpp \
cppIVRScreenshots_IVRScreenshots_001.cpp \
cppIVRResources_IVRResources_001.cpp \
cppIVRDriverManager_IVRDriverManager_001.cpp \
cppIVRClientCore_IVRClientCore_003.cpp \
struct_converters_1010.cpp \
cppIVRCompositor_IVRCompositor_021.cpp \
cppIVROverlay_IVROverlay_016.cpp \
struct_converters_109.cpp \
cppIVRSystem_IVRSystem_016.cpp \
cppIVRCompositor_IVRCompositor_020.cpp \
cppIVRClientCore_IVRClientCore_002.cpp \
struct_converters_108.cpp \
struct_converters_107.cpp \
cppIVRSystem_IVRSystem_015.cpp \
struct_converters_106.cpp \
cppIVROverlay_IVROverlay_014.cpp \
struct_converters_105.cpp \
cppIVRCompositor_IVRCompositor_019.cpp \
struct_converters_104.cpp \
cppIVRSystem_IVRSystem_014.cpp \
cppIVRCompositor_IVRCompositor_018.cpp \
cppIVROverlay_IVROverlay_013.cpp \
struct_converters_103.cpp \
cppIVRSystem_IVRSystem_012.cpp \
cppIVRCompositor_IVRCompositor_016.cpp \
struct_converters_102.cpp \
cppIVRSettings_IVRSettings_001.cpp \
struct_converters_101.cpp \
cppIVRApplications_IVRApplications_005.cpp \
cppIVRCompositor_IVRCompositor_015.cpp \
cppIVROverlay_IVROverlay_012.cpp \
struct_converters_100.cpp \
cppIVRTrackedCamera_IVRTrackedCamera_002.cpp \
struct_converters_0920.cpp \
cppIVRCompositor_IVRCompositor_014.cpp \
cppIVROverlay_IVROverlay_011.cpp \
struct_converters_0919.cpp \
cppIVRCompositor_IVRCompositor_013.cpp \
struct_converters_0918.cpp \
cppIVRSystem_IVRSystem_011.cpp \
cppIVRApplications_IVRApplications_004.cpp \
cppIVROverlay_IVROverlay_010.cpp \
cppIVRRenderModels_IVRRenderModels_004.cpp \
struct_converters_0917.cpp \
cppIVRCompositor_IVRCompositor_012.cpp \
struct_converters_0916.cpp \
cppIVRApplications_IVRApplications_003.cpp \
cppIVRCompositor_IVRCompositor_011.cpp \
struct_converters_0915.cpp \
cppIVRRenderModels_IVRRenderModels_002.cpp \
struct_converters_0914.cpp \
cppIVRSystem_IVRSystem_010.cpp \
cppIVRApplications_IVRApplications_002.cpp \
cppIVRChaperoneSetup_IVRChaperoneSetup_004.cpp \
cppIVRCompositor_IVRCompositor_010.cpp \
cppIVROverlay_IVROverlay_008.cpp \
cppIVRTrackedCamera_IVRTrackedCamera_001.cpp \
struct_converters_0913.cpp \
cppIVRCompositor_IVRCompositor_009.cpp \
struct_converters_0912.cpp \
cppIVRSystem_IVRSystem_009.cpp \
cppIVROverlay_IVROverlay_007.cpp \
struct_converters_0910.cpp \
cppIVRSystem_IVRSystem_006.cpp \
cppIVRApplications_IVRApplications_001.cpp \
cppIVRChaperone_IVRChaperone_002.cpp \
cppIVRCompositor_IVRCompositor_008.cpp \
cppIVRNotifications_IVRNotifications_001.cpp \
cppIVROverlay_IVROverlay_005.cpp \
cppIVRRenderModels_IVRRenderModels_001.cpp \
struct_converters_099.cpp \
struct_converters_098.cpp \
cppIVRSystem_IVRSystem_005.cpp \
cppIVRCompositor_IVRCompositor_007.cpp \
cppIVROverlay_IVROverlay_004.cpp \
struct_converters_097.cpp \
cppIVROverlay_IVROverlay_003.cpp \
struct_converters_096.cpp \
struct_converters_094.cpp \
cppIVROverlay_IVROverlay_002.cpp \
struct_converters_093.cpp \
struct_converters_092.cpp \
cppIVRSystem_IVRSystem_004.cpp \
cppIVRCompositor_IVRCompositor_006.cpp \
cppIVROverlay_IVROverlay_001.cpp \
struct_converters_091.cpp \
cppIVRSystem_IVRSystem_003.cpp \
cppIVRCompositor_IVRCompositor_005.cpp \
struct_converters_090.cpp \

7
vrclient_x64/Makefile.in.orig
View file

@ -1,7 +0,0 @@
MODULE = vrclient_x64.dll
EXTRADEFS = -Wno-unused-variable -Wno-attributes -DGNUC
CPPFLAGS = -std=c++0x
C_SRCS = \
vrclient_main.c \

6
vrclient_x64/cxx.h
View file

@ -18,6 +18,12 @@
/* Copied from dlls/msvcrt/cxx.h */
#undef __thiscall
#define __ASM_NAME(name) name
#define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl " #name suffix "\n\t.type " #name suffix ",@function\n" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc\n\t.previous");
#define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(name,"",code)
#define __ASM_STDCALL(args) ""
#ifdef __i386__ /* thiscall functions are i386-specific */
#define THISCALL(func) __thiscall_ ## func

7
vrclient_x64/gen.sh
View file

@ -8,11 +8,4 @@ rm cpp*.h
rm struct*.h
rm struct*.cpp
h=$(md5sum Makefile.in)
cp Makefile.in.orig Makefile.in
cp ../vrclient/Makefile.in.orig ../vrclient/Makefile.in
./gen_wrapper.py
if [ "$h" != "$(md5sum Makefile.in)" ]; then
echo "Don't forget to \"make depend\" at the top of the tree!"
fi

26
vrclient_x64/gen_wrapper.py
View file

@ -319,19 +319,12 @@ def handle_class(sdkver, classnode):
if already_generated:
return
winname = "win%s" % classnode.spelling
if not winname in generated_c_files:
generated_c_files.append(winname)
cppname = "cpp%s_%s" % (classnode.spelling, iface_version)
generated_cpp_files.append(cppname)
file_exists = os.path.isfile("%s.c" % winname)
cfile = open("%s.c" % winname, "a")
if not file_exists:
cfile.write("""/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>
@ -433,7 +426,6 @@ def handle_struct(sdkver, struct, which):
file_exists = os.path.isfile(cppname)
cppfile = open(cppname, "a")
if not file_exists:
generated_cpp_files.append(filename_base)
cppfile.write("#include <stdlib.h>\n");
cppfile.write("#include <string.h>\n");
cppfile.write("#include \"vrclient_private.h\"\n")
@ -500,9 +492,6 @@ def handle_struct(sdkver, struct, which):
#clang.cindex.Config.set_library_file("/usr/lib/llvm-3.8/lib/libclang-3.8.so.1");
generated_c_files = []
generated_cpp_files = []
prog = re.compile("^.*const\s*char.* (\w*)_Version.*\"(.*)\"")
for sdkver in sdk_versions:
iface_versions = {}
@ -548,18 +537,3 @@ for sdkver in sdk_versions:
for f in cpp_files_need_close_brace:
m = open(f, "a")
m.write("\n}\n")
m = open("Makefile.in", "a")
for f in generated_c_files:
m.write("\t%s.c \\\n" % f)
m.write("\nCPP_SRCS = \\\n")
for f in generated_cpp_files:
m.write("\t%s.cpp \\\n" % f)
m = open("../vrclient/Makefile.in", "a")
for f in generated_c_files:
m.write("\t%s.c \\\n" % f)
m.write("\nCPP_SRCS = \\\n")
for f in generated_cpp_files:
m.write("\t%s.cpp \\\n" % f)

4
vrclient_x64/winIVRApplications.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRChaperone.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRChaperoneSetup.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRClientCore.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRCompositor.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRDriverManager.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRExtendedDisplay.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRNotifications.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVROverlay.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRRenderModels.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRResources.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRScreenshots.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRSettings.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRSystem.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>

4
vrclient_x64/winIVRTrackedCamera.c
View file

@ -1,8 +1,4 @@
/* This file is auto-generated, do not edit. */
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#include <stdint.h>