vrclient: Move source files to separate directory.

In preparation for the next commit.

build_proton.sh

@@ -371,15 +371,16 @@ function build_vrclient64
         -I"$TOOLS_DIR64"/include/ \
         -I"$TOOLS_DIR64"/include/wine/ \
         -I"$TOOLS_DIR64"/include/wine/windows/ \
+        -I.. \
         -L"$TOOLS_DIR64"/lib64/ \
         -L"$TOOLS_DIR64"/lib64/wine/ \
-        --dll .
+        --dll vrclient_x64
-    CXXFLAGS="-Wno-attributes -std=c++0x -O2 -g" CFLAGS="-O2 -g" PATH="$TOOLS_DIR64/bin:$PATH" $AMD64_WRAPPER make $JOBS
+    CXXFLAGS="-Wno-attributes -std=c++0x -O2 -g" CFLAGS="-O2 -g" PATH="$TOOLS_DIR64/bin:$PATH" $AMD64_WRAPPER make $JOBS -C vrclient_x64
-    PATH="$TOOLS_DIR64/bin:$PATH" $AMD64_WRAPPER winebuild --dll --fake-module -E vrclient_x64.spec -o vrclient_x64.dll.fake
+    PATH="$TOOLS_DIR64/bin:$PATH" $AMD64_WRAPPER winebuild --dll --fake-module -E vrclient_x64/vrclient_x64.spec -o vrclient_x64.dll.fake
     if [ x"$STRIP" != x ]; then
-        $AMD64_WRAPPER $STRIP vrclient_x64.dll.so
+        $AMD64_WRAPPER $STRIP vrclient_x64/vrclient_x64.dll.so
     fi
-    cp -a vrclient_x64.dll.so "$DST_DIR"/lib64/wine/
+    cp -a vrclient_x64/vrclient_x64.dll.so "$DST_DIR"/lib64/wine/
     cp -a vrclient_x64.dll.fake "$DST_DIR"/lib64/wine/fakedlls/vrclient_x64.dll
 }
 
@@ -389,21 +390,23 @@ function build_vrclient32
     rm -rf build/vrclient
     cp -a vrclient_x64 build/vrclient
     cd "$TOP"/build/vrclient/
-    mv vrclient_x64.spec vrclient.spec
+    mv vrclient_x64 vrclient
+    mv vrclient/vrclient_x64.spec vrclient/vrclient.spec
     $I386_WRAPPER "$TOP"/wine/tools/winemaker/winemaker \
         --nosource-fix --nolower-include --nodlls --nomsvcrt --wine32 \
         -I"$TOOLS_DIR32"/include/ \
         -I"$TOOLS_DIR32"/include/wine/ \
         -I"$TOOLS_DIR32"/include/wine/windows/ \
+        -I.. \
         -L"$TOOLS_DIR32"/lib/ \
         -L"$TOOLS_DIR32"/lib/wine/ \
-        --dll .
+        --dll vrclient
-    CXXFLAGS="-Wno-attributes -std=c++0x -O2 -g" CFLAGS="-O2 -g" PATH="$TOOLS_DIR32/bin:$PATH" $I386_WRAPPER make $JOBS
+    CXXFLAGS="-Wno-attributes -std=c++0x -O2 -g" CFLAGS="-O2 -g" PATH="$TOOLS_DIR32/bin:$PATH" $I386_WRAPPER make $JOBS -C vrclient
-    PATH="$TOOLS_DIR32/bin:$PATH" $I386_WRAPPER winebuild --dll --fake-module -E vrclient.spec -o vrclient.dll.fake
+    PATH="$TOOLS_DIR32/bin:$PATH" $I386_WRAPPER winebuild --dll --fake-module -E vrclient/vrclient.spec -o vrclient.dll.fake
     if [ x"$STRIP" != x ]; then
-        $I386_WRAPPER $STRIP vrclient.dll.so
+        $I386_WRAPPER $STRIP vrclient/vrclient.dll.so
     fi
-    cp -a vrclient.dll.so "$DST_DIR"/lib/wine/
+    cp -a vrclient/vrclient.dll.so "$DST_DIR"/lib/wine/
     cp -a vrclient.dll.fake "$DST_DIR"/lib/wine/fakedlls/vrclient.dll
 }
 

vrclient_x64/gen.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-rm win*.h
+rm vrclient_x64/win*.h
-rm win*.c
+rm vrclient_x64/win*.c
-rm win*.dat
+rm vrclient_x64/win*.dat
-rm cpp*.cpp
+rm vrclient_x64/cpp*.cpp
-rm cpp*.h
+rm vrclient_x64/cpp*.h
-rm struct*.h
+rm vrclient_x64/struct*.h
-rm struct*.cpp
+rm vrclient_x64/struct*.cpp
 
 ./gen_wrapper.py

vrclient_x64/gen_wrapper.py

@@ -422,8 +422,8 @@ def handle_class(sdkver, classnode):
     winname = "win%s" % classnode.spelling
     cppname = "cpp%s_%s" % (classnode.spelling, iface_version)
 
-    file_exists = os.path.isfile("%s.c" % winname)
+    file_exists = os.path.isfile("vrclient_x64/%s.c" % winname)
-    cfile = open("%s.c" % winname, "a")
+    cfile = open("vrclient_x64/%s.c" % winname, "a")
     if not file_exists:
         cfile.write("""/* This file is auto-generated, do not edit. */
 #include <stdarg.h>
@@ -447,7 +447,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
 
 """)
 
-    cpp = open("%s.cpp" % cppname, "w")
+    cpp = open("vrclient_x64/%s.cpp" % cppname, "w")
     cpp.write("#include \"vrclient_private.h\"\n")
     cpp.write("#include \"vrclient_defs.h\"\n")
     if os.path.isfile("openvr_%s/ivrclientcore.h" % sdkver):
@@ -461,7 +461,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
     cpp.write("#include \"%s.h\"\n" % cppname)
     cpp.write("#ifdef __cplusplus\nextern \"C\" {\n#endif\n")
 
-    cpp_h = open("%s.h" % cppname, "w")
+    cpp_h = open("vrclient_x64/%s.h" % cppname, "w")
     cpp_h.write("#ifdef __cplusplus\nextern \"C\" {\n#endif\n")
 
     winclassname = "win%s_%s" % (classnode.spelling, iface_version)
@@ -538,15 +538,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
     cpp.write("#ifdef __cplusplus\n}\n#endif\n")
     cpp_h.write("#ifdef __cplusplus\n}\n#endif\n")
 
-    constructors = open("win_constructors.h", "a")
+    constructors = open("vrclient_x64/win_constructors.h", "a")
     constructors.write("extern void *create_%s(void *);\n" % winclassname)
     constructors.write("extern void *create_%s_FnTable(void *);\n" % winclassname)
 
-    destructors = open("win_destructors.h", "a")
+    destructors = open("vrclient_x64/win_destructors.h", "a")
     destructors.write("extern void destroy_%s(void *);\n" % winclassname)
     destructors.write("extern void destroy_%s_FnTable(void *);\n" % winclassname)
 
-    constructors = open("win_constructors_table.dat", "a")
+    constructors = open("vrclient_x64/win_constructors_table.dat", "a")
     constructors.write("    {\"%s\", &create_%s, &destroy_%s},\n" % (iface_version, winclassname, winclassname))
     constructors.write("    {\"FnTable:%s\", &create_%s_FnTable, &destroy_%s_FnTable},\n" % (iface_version, winclassname, winclassname))
     if iface_version in aliases.keys():
@@ -573,7 +573,7 @@ def handle_struct(sdkver, struct, which):
         return
 
     filename_base = "struct_converters_%s" % display_sdkver(sdkver)
-    cppname = "%s.cpp" % filename_base
+    cppname = "vrclient_x64/%s.cpp" % filename_base
     file_exists = os.path.isfile(cppname)
     cppfile = open(cppname, "a")
     if not file_exists:
@@ -587,7 +587,7 @@ def handle_struct(sdkver, struct, which):
         cppfile.write("#include \"struct_converters.h\"\n")
         cpp_files_need_close_brace.append(cppname)
 
-    hfile = open("struct_converters.h", "a")
+    hfile = open("vrclient_x64/struct_converters.h", "a")
 
     hfile.write("typedef struct win%s win%s;\n" % (handler_name, handler_name))
 
@@ -685,7 +685,7 @@ def generate_x64_call_flat_method(cfile, param_count, has_floats, is_4th_float):
     l(r'extern void %s(void);' % name);
 
 def generate_flatapi_c():
-    with open("flatapi.c", "w") as f:
+    with open("vrclient_x64/flatapi.c", "w") as f:
         f.write(r"""/* This file is auto-generated, do not edit. */
 
 #include <stdarg.h>