diff --git a/vrclient_x64/Makefile.in b/vrclient_x64/Makefile.in deleted file mode 100644 index 690c255e..00000000 --- a/vrclient_x64/Makefile.in +++ /dev/null @@ -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 \ diff --git a/vrclient_x64/Makefile.in.orig b/vrclient_x64/Makefile.in.orig deleted file mode 100644 index a2be0657..00000000 --- a/vrclient_x64/Makefile.in.orig +++ /dev/null @@ -1,7 +0,0 @@ -MODULE = vrclient_x64.dll - -EXTRADEFS = -Wno-unused-variable -Wno-attributes -DGNUC -CPPFLAGS = -std=c++0x - -C_SRCS = \ - vrclient_main.c \ diff --git a/vrclient_x64/cxx.h b/vrclient_x64/cxx.h index a2f59d7c..6307e7e3 100644 --- a/vrclient_x64/cxx.h +++ b/vrclient_x64/cxx.h @@ -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 diff --git a/vrclient_x64/gen.sh b/vrclient_x64/gen.sh index 2a5653c0..6440b9fd 100755 --- a/vrclient_x64/gen.sh +++ b/vrclient_x64/gen.sh @@ -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 diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py index 192d0e26..bd80f4e9 100755 --- a/vrclient_x64/gen_wrapper.py +++ b/vrclient_x64/gen_wrapper.py @@ -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 #include @@ -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 \n"); cppfile.write("#include \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) diff --git a/vrclient_x64/winIVRApplications.c b/vrclient_x64/winIVRApplications.c index ba63bd82..6ec82173 100644 --- a/vrclient_x64/winIVRApplications.c +++ b/vrclient_x64/winIVRApplications.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRChaperone.c b/vrclient_x64/winIVRChaperone.c index 096ab9fe..e3043b52 100644 --- a/vrclient_x64/winIVRChaperone.c +++ b/vrclient_x64/winIVRChaperone.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRChaperoneSetup.c b/vrclient_x64/winIVRChaperoneSetup.c index 041a0368..17eec9b8 100644 --- a/vrclient_x64/winIVRChaperoneSetup.c +++ b/vrclient_x64/winIVRChaperoneSetup.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRClientCore.c b/vrclient_x64/winIVRClientCore.c index 53b959e0..ba75b658 100644 --- a/vrclient_x64/winIVRClientCore.c +++ b/vrclient_x64/winIVRClientCore.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRCompositor.c b/vrclient_x64/winIVRCompositor.c index 03d098fa..5b83c94f 100644 --- a/vrclient_x64/winIVRCompositor.c +++ b/vrclient_x64/winIVRCompositor.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRDriverManager.c b/vrclient_x64/winIVRDriverManager.c index 824ca550..91ca16b9 100644 --- a/vrclient_x64/winIVRDriverManager.c +++ b/vrclient_x64/winIVRDriverManager.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRExtendedDisplay.c b/vrclient_x64/winIVRExtendedDisplay.c index 7be2c2da..c3b25f7d 100644 --- a/vrclient_x64/winIVRExtendedDisplay.c +++ b/vrclient_x64/winIVRExtendedDisplay.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRNotifications.c b/vrclient_x64/winIVRNotifications.c index 10a0cd2d..d3574445 100644 --- a/vrclient_x64/winIVRNotifications.c +++ b/vrclient_x64/winIVRNotifications.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVROverlay.c b/vrclient_x64/winIVROverlay.c index 57430a75..f4f7c8ee 100644 --- a/vrclient_x64/winIVROverlay.c +++ b/vrclient_x64/winIVROverlay.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRRenderModels.c b/vrclient_x64/winIVRRenderModels.c index 90cf0a8b..ce13a351 100644 --- a/vrclient_x64/winIVRRenderModels.c +++ b/vrclient_x64/winIVRRenderModels.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRResources.c b/vrclient_x64/winIVRResources.c index ec2fc257..1839ecff 100644 --- a/vrclient_x64/winIVRResources.c +++ b/vrclient_x64/winIVRResources.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRScreenshots.c b/vrclient_x64/winIVRScreenshots.c index 24bb4043..5206cd35 100644 --- a/vrclient_x64/winIVRScreenshots.c +++ b/vrclient_x64/winIVRScreenshots.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRSettings.c b/vrclient_x64/winIVRSettings.c index d3be9d5f..a44d5ba3 100644 --- a/vrclient_x64/winIVRSettings.c +++ b/vrclient_x64/winIVRSettings.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRSystem.c b/vrclient_x64/winIVRSystem.c index 8f510115..f77080b5 100644 --- a/vrclient_x64/winIVRSystem.c +++ b/vrclient_x64/winIVRSystem.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include diff --git a/vrclient_x64/winIVRTrackedCamera.c b/vrclient_x64/winIVRTrackedCamera.c index 45eee7c6..8d210ac0 100644 --- a/vrclient_x64/winIVRTrackedCamera.c +++ b/vrclient_x64/winIVRTrackedCamera.c @@ -1,8 +1,4 @@ /* This file is auto-generated, do not edit. */ - -#include "config.h" -#include "wine/port.h" - #include #include