From 6d5ffa9f8e8daf04b560036d833f24acb332d123 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 21 Jun 2020 23:15:17 +0900 Subject: [PATCH] [build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen). --- Makefile.am | 113 +- RPM/Makefile.am | 9 - RPM/Makemodule.am | 6 + bootstrap | 2 +- config.d/ac_config_files.m4 | 98 -- config.d/build_control.m4 | 90 +- config.d/rpm.m4 | 2 +- configure.ac | 2 +- debian/Makefile.am | 23 - debian/Makemodule.am | 28 + desktop/Makefile.am | 49 - desktop/Makemodule.am | 10 + desktop/quakeforge-nq-glx.desktop | 18 - desktop/quakeforge-nq-sdl32.desktop | 18 - desktop/quakeforge-nq-sgl.desktop | 18 - desktop/quakeforge-qw-glx.desktop | 18 - desktop/quakeforge-qw-sdl32.desktop | 18 - desktop/quakeforge-qw-sgl.desktop | 18 - doc/Makefile.am | 55 - doc/Makemodule.am | 80 ++ doc/man/Makefile.am | 4 - hw/Makefile.am | 4 - hw/Makemodule.am | 1 + hw/include/Makefile.am | 4 - hw/source/{Makefile.am => Makemodule.am} | 22 +- include/Makefile.am | 26 - include/Makemodule.am | 88 ++ include/QF/Makefile.am | 38 - include/QF/Makemodule.am | 151 +++ libs/Makefile.am | 12 - libs/Makemodule.am | 13 + libs/audio/Makefile.am | 77 -- libs/audio/Makemodule.am | 67 ++ libs/audio/renderer/Makefile.am | 55 - libs/audio/renderer/Makemodule.am | 46 + libs/audio/targets/Makefile.am | 62 -- libs/audio/targets/Makemodule.am | 54 + libs/audio/test/Makefile.am | 6 +- libs/client/Makefile.am | 11 - libs/client/Makemodule.am | 6 + libs/console/Makefile.am | 43 - libs/console/Makemodule.am | 33 + libs/gamecode/Makefile.am | 16 - libs/gamecode/Makemodule.am | 19 + libs/gib/Makefile.am | 22 - libs/gib/Makemodule.am | 29 + libs/image/Makefile.am | 18 - libs/image/Makemodule.am | 9 + libs/models/Makefile.am | 58 -- libs/models/Makemodule.am | 55 + libs/models/alias/Makefile.am | 20 - libs/models/alias/Makemodule.am | 15 + libs/models/brush/Makefile.am | 22 - libs/models/brush/Makemodule.am | 17 + libs/models/iqm/Makefile.am | 20 - libs/models/iqm/Makemodule.am | 15 + libs/models/sprite/Makefile.am | 20 - libs/models/sprite/Makemodule.am | 15 + libs/models/test/Makefile.am | 24 - libs/models/test/Makemodule.am | 36 + libs/net/Makefile.am | 19 - libs/net/Makemodule.am | 14 + libs/net/nc/Makefile.am | 17 - libs/net/nc/Makemodule.am | 8 + libs/net/nm/Makefile.am | 18 - libs/net/nm/Makemodule.am | 8 + libs/qw/Makefile.am | 8 - libs/qw/Makemodule.am | 4 + libs/ruamoko/Makefile.am | 21 - libs/ruamoko/Makemodule.am | 26 + libs/util/Makefile.am | 60 -- libs/util/Makemodule.am | 84 ++ libs/util/test/Makefile.am | 70 -- libs/util/test/Makemodule.am | 79 ++ libs/video/Makefile.am | 6 - libs/video/Makemodule.am | 2 + libs/video/renderer/Makefile.am | 65 -- libs/video/renderer/Makemodule.am | 185 ++++ libs/video/renderer/gl/Makefile.am | 16 - libs/video/renderer/glsl/Makefile.am | 28 - libs/video/renderer/glsl/vid_common_glsl.c | 2 +- libs/video/renderer/sw/Makefile.am | 33 - libs/video/renderer/sw32/Makefile.am | 18 - libs/video/targets/Makefile.am | 117 --- libs/video/targets/Makemodule.am | 115 +++ m4/quakeforge.m4 | 16 +- nq/Makefile.am | 4 - nq/Makemodule.am | 3 + nq/include/Makefile.am | 5 - nq/include/Makemodule.am | 11 + nq/source/Makefile.am | 176 ---- nq/source/Makemodule.am | 164 +++ nq/source/cl_chase.c | 5 +- nq/source/cl_cmd.c | 2 +- nq/source/cl_demo.c | 5 +- nq/source/cl_ents.c | 11 +- nq/source/cl_input.c | 7 +- nq/source/cl_main.c | 15 +- nq/source/cl_parse.c | 9 +- nq/source/cl_screen.c | 3 +- nq/source/cl_tent.c | 3 +- nq/source/cl_view.c | 7 +- nq/source/game.c | 4 +- nq/source/host.c | 9 +- nq/source/host_cmd.c | 9 +- nq/source/sbar.c | 7 +- nq/source/sv_cl_phys.c | 7 +- nq/source/sv_cvar.c | 2 +- nq/source/sv_ded.c | 4 +- nq/source/sv_main.c | 7 +- nq/source/sv_move.c | 5 +- nq/source/sv_phys.c | 5 +- nq/source/sv_pr_cmds.c | 7 +- nq/source/sv_progs.c | 7 +- nq/source/sv_user.c | 7 +- nq/source/sys_sdl.c | 6 +- nq/source/sys_unix.c | 4 +- nq/source/sys_unixd.c | 2 +- nq/source/sys_win.c | 4 +- nq/source/sys_wind.c | 2 +- nq/source/world.c | 5 +- pkg-config/Makefile.am | 5 - pkg-config/Makemodule.am | 5 + qtv/Makefile.am | 4 - qtv/Makemodule.am | 2 + qtv/include/Makefile.am | 4 - qtv/include/Makemodule.am | 5 + qtv/source/{Makefile.am => Makemodule.am} | 29 +- qtv/source/client.c | 8 +- qtv/source/connection.c | 2 +- qtv/source/qtv.c | 13 +- qtv/source/sbar.c | 7 +- qtv/source/server.c | 8 +- qtv/source/sv_parse.c | 8 +- qw/Makefile.am | 4 - qw/Makemodule.am | 2 + qw/include/Makefile.am | 9 - qw/include/Makemodule.am | 28 + qw/source/Makefile.am | 191 ---- qw/source/Makemodule.am | 175 ++++ qw/source/cl_cam.c | 11 +- qw/source/cl_chase.c | 6 +- qw/source/cl_chat.c | 4 +- qw/source/cl_cmd.c | 2 +- qw/source/cl_cvar.c | 3 +- qw/source/cl_demo.c | 13 +- qw/source/cl_entparse.c | 24 +- qw/source/cl_ents.c | 25 +- qw/source/cl_http.c | 8 +- qw/source/cl_input.c | 19 +- qw/source/cl_main.c | 42 +- qw/source/cl_ngraph.c | 5 +- qw/source/cl_parse.c | 32 +- qw/source/cl_pred.c | 9 +- qw/source/cl_rss.c | 4 +- qw/source/cl_screen.c | 3 +- qw/source/cl_skin.c | 9 +- qw/source/cl_slist.c | 6 +- qw/source/cl_sys_sdl.c | 3 +- qw/source/cl_sys_unix.c | 3 +- qw/source/cl_sys_win.c | 4 +- qw/source/cl_tent.c | 11 +- qw/source/cl_view.c | 16 +- qw/source/crudefile.c | 3 +- qw/source/game.c | 4 +- qw/source/locs.c | 3 +- qw/source/map_cfg.c | 2 +- qw/source/net_packetlog.c | 3 +- qw/source/pmove.c | 3 +- qw/source/pmovetst.c | 1 + qw/source/sbar.c | 9 +- qw/source/sv_ccmds.c | 13 +- qw/source/sv_demo.c | 9 +- qw/source/sv_ents.c | 7 +- qw/source/sv_gib.c | 4 +- qw/source/sv_init.c | 11 +- qw/source/sv_main.c | 19 +- qw/source/sv_move.c | 4 +- qw/source/sv_phys.c | 4 +- qw/source/sv_pr_cmds.c | 11 +- qw/source/sv_pr_cpqw.c | 6 +- qw/source/sv_pr_qwe.c | 8 +- qw/source/sv_progs.c | 9 +- qw/source/sv_qtv.c | 7 +- qw/source/sv_recorder.c | 8 +- qw/source/sv_sbar.c | 5 +- qw/source/sv_send.c | 9 +- qw/source/sv_sys_unix.c | 2 +- qw/source/sv_sys_win.c | 2 +- qw/source/sv_user.c | 11 +- qw/source/teamplay.c | 7 +- qw/source/world.c | 5 +- ruamoko/Makefile.am | 8 - ruamoko/Makemodule.am | 10 + ruamoko/cl_menu/Makefile.am | 71 -- ruamoko/cl_menu/Makemodule.am | 77 ++ ruamoko/game/Makefile.am | 56 - ruamoko/game/Makemodule.am | 27 + ruamoko/gui/Makefile.am | 50 - ruamoko/gui/Makemodule.am | 25 + ruamoko/include/Makefile.am | 16 - ruamoko/include/Makemodule.am | 56 + ruamoko/lib/Makefile.am | 96 -- ruamoko/lib/Makemodule.am | 87 ++ ruamoko/qwaq/Makefile.am | 135 --- ruamoko/qwaq/Makemodule.am | 149 +++ ruamoko/qwaq/builtins/builtins.c | 2 +- ruamoko/qwaq/builtins/curses.c | 8 +- ruamoko/qwaq/builtins/debug.c | 8 +- ruamoko/qwaq/builtins/editbuffer.c | 4 +- ruamoko/qwaq/builtins/input.c | 6 +- ruamoko/qwaq/builtins/main.c | 4 +- ruamoko/qwaq/builtins/qwaq-bi.c | 2 +- ruamoko/qwaq/builtins/qwaq.c | 2 +- ruamoko/qwaq/debugger/debug.h | 2 +- ruamoko/qwaq/debugger/debug.r | 2 +- ruamoko/qwaq/debugger/debugger.h | 4 +- ruamoko/qwaq/debugger/debugger.r | 20 +- ruamoko/qwaq/debugger/localsdata.h | 4 +- ruamoko/qwaq/debugger/localsdata.r | 8 +- ruamoko/qwaq/debugger/typeencodings.h | 2 +- ruamoko/qwaq/debugger/typeencodings.r | 4 +- ruamoko/qwaq/debugger/views/basicview.h | 2 +- ruamoko/qwaq/debugger/views/basicview.r | 4 +- ruamoko/qwaq/debugger/views/defview.h | 4 +- ruamoko/qwaq/debugger/views/defview.r | 4 +- ruamoko/qwaq/debugger/views/doubleview.h | 2 +- ruamoko/qwaq/debugger/views/doubleview.r | 2 +- ruamoko/qwaq/debugger/views/entityview.h | 2 +- ruamoko/qwaq/debugger/views/entityview.r | 2 +- ruamoko/qwaq/debugger/views/fieldview.h | 2 +- ruamoko/qwaq/debugger/views/fieldview.r | 2 +- ruamoko/qwaq/debugger/views/floatview.h | 2 +- ruamoko/qwaq/debugger/views/floatview.r | 2 +- ruamoko/qwaq/debugger/views/funcview.h | 2 +- ruamoko/qwaq/debugger/views/funcview.r | 2 +- ruamoko/qwaq/debugger/views/intview.h | 2 +- ruamoko/qwaq/debugger/views/intview.r | 2 +- ruamoko/qwaq/debugger/views/nameview.h | 2 +- ruamoko/qwaq/debugger/views/nameview.r | 2 +- ruamoko/qwaq/debugger/views/pointerview.h | 2 +- ruamoko/qwaq/debugger/views/pointerview.r | 2 +- ruamoko/qwaq/debugger/views/quatview.h | 2 +- ruamoko/qwaq/debugger/views/quatview.r | 2 +- ruamoko/qwaq/debugger/views/stringview.h | 2 +- ruamoko/qwaq/debugger/views/stringview.r | 2 +- ruamoko/qwaq/debugger/views/uintview.h | 2 +- ruamoko/qwaq/debugger/views/uintview.r | 2 +- ruamoko/qwaq/debugger/views/vectorview.h | 2 +- ruamoko/qwaq/debugger/views/vectorview.r | 2 +- ruamoko/qwaq/debugger/views/voidview.h | 2 +- ruamoko/qwaq/debugger/views/voidview.r | 2 +- ruamoko/qwaq/editor/editbuffer.r | 2 +- ruamoko/qwaq/editor/editor.h | 4 +- ruamoko/qwaq/editor/editor.r | 8 +- ruamoko/qwaq/qwaq-app.h | 4 +- ruamoko/qwaq/qwaq-app.r | 12 +- ruamoko/qwaq/ui/button.h | 4 +- ruamoko/qwaq/ui/button.r | 4 +- ruamoko/qwaq/ui/curses.h | 4 +- ruamoko/qwaq/ui/draw.h | 2 +- ruamoko/qwaq/ui/draw.r | 4 +- ruamoko/qwaq/ui/garray.r | 4 +- ruamoko/qwaq/ui/group.h | 4 +- ruamoko/qwaq/ui/group.r | 10 +- ruamoko/qwaq/ui/listener.r | 4 +- ruamoko/qwaq/ui/proxyview.h | 2 +- ruamoko/qwaq/ui/proxyview.r | 4 +- ruamoko/qwaq/ui/rect.r | 2 +- ruamoko/qwaq/ui/scrollbar.h | 2 +- ruamoko/qwaq/ui/scrollbar.r | 8 +- ruamoko/qwaq/ui/tableview.h | 2 +- ruamoko/qwaq/ui/tableview.r | 4 +- ruamoko/qwaq/ui/textcontext.h | 6 +- ruamoko/qwaq/ui/textcontext.r | 4 +- ruamoko/qwaq/ui/titlebar.h | 2 +- ruamoko/qwaq/ui/titlebar.r | 4 +- ruamoko/qwaq/ui/view.h | 6 +- ruamoko/qwaq/ui/view.r | 10 +- ruamoko/qwaq/ui/window.h | 6 +- ruamoko/qwaq/ui/window.r | 16 +- ruamoko/scheme/Makefile.am | 81 -- ruamoko/scheme/Makemodule.am | 88 ++ tools/Makefile.am | 6 - tools/Makemodule.am | 20 + tools/bsp2img/{Makefile.am => Makemodule.am} | 6 +- tools/carne/Makefile.am | 13 - tools/carne/Makemodule.am | 8 + tools/pak/Makefile.am | 19 - tools/pak/Makemodule.am | 14 + tools/qfbsp/Makefile.am | 3 - tools/qfbsp/Makemodule.am | 2 + tools/qfbsp/include/Makefile.am | 5 - tools/qfbsp/include/Makemodule.am | 16 + tools/qfbsp/source/Makefile.am | 16 - tools/qfbsp/source/Makemodule.am | 25 + tools/qfbsp/source/brush.c | 10 +- tools/qfbsp/source/csg4.c | 14 +- tools/qfbsp/source/map.c | 2 +- tools/qfbsp/source/merge.c | 12 +- tools/qfbsp/source/nodraw.c | 2 +- tools/qfbsp/source/options.c | 2 +- tools/qfbsp/source/outside.c | 12 +- tools/qfbsp/source/portals.c | 10 +- tools/qfbsp/source/qfbsp.c | 24 +- tools/qfbsp/source/readbsp.c | 10 +- tools/qfbsp/source/region.c | 6 +- tools/qfbsp/source/solidbsp.c | 12 +- tools/qfbsp/source/surfaces.c | 10 +- tools/qfbsp/source/tjunc.c | 8 +- tools/qfbsp/source/writebsp.c | 8 +- tools/qfcc/Makefile.am | 48 - tools/qfcc/Makemodule.am | 4 + tools/qfcc/bootstrap | 3 - tools/qfcc/configure.in | 144 --- tools/qfcc/doc/Makefile.am | 6 - tools/qfcc/doc/Makemodule.am | 5 + tools/qfcc/doc/man/Makefile.am | 4 - tools/qfcc/include/Makefile.am | 7 - tools/qfcc/include/Makemodule.am | 34 + tools/qfcc/source/Makefile.am | 76 -- tools/qfcc/source/Makemodule.am | 92 ++ tools/qfcc/source/class.c | 34 +- tools/qfcc/source/codespace.c | 2 +- tools/qfcc/source/constfold.c | 17 +- tools/qfcc/source/cpp.c | 6 +- tools/qfcc/source/dags.c | 24 +- tools/qfcc/source/debug.c | 24 +- tools/qfcc/source/def.c | 32 +- tools/qfcc/source/defspace.c | 18 +- tools/qfcc/source/diagnostic.c | 14 +- tools/qfcc/source/disassemble.c | 2 +- tools/qfcc/source/dot.c | 8 +- tools/qfcc/source/dot_dag.c | 10 +- tools/qfcc/source/dot_expr.c | 11 +- tools/qfcc/source/dot_flow.c | 12 +- tools/qfcc/source/dot_sblock.c | 18 +- tools/qfcc/source/dot_type.c | 9 +- tools/qfcc/source/dump_globals.c | 10 +- tools/qfcc/source/dump_lines.c | 4 +- tools/qfcc/source/dump_modules.c | 2 +- tools/qfcc/source/dump_strings.c | 4 +- tools/qfcc/source/emit.c | 30 +- tools/qfcc/source/expr.c | 39 +- tools/qfcc/source/expr_assign.c | 37 +- tools/qfcc/source/expr_binary.c | 11 +- tools/qfcc/source/expr_bool.c | 39 +- tools/qfcc/source/expr_compound.c | 10 +- tools/qfcc/source/expr_obj.c | 37 +- tools/qfcc/source/flow.c | 24 +- tools/qfcc/source/function.c | 40 +- tools/qfcc/source/grab.c | 12 +- tools/qfcc/source/idstuff.c | 20 +- tools/qfcc/source/linker.c | 30 +- tools/qfcc/source/method.c | 32 +- tools/qfcc/source/obj_file.c | 34 +- tools/qfcc/source/obj_type.c | 20 +- tools/qfcc/source/opcodes.c | 10 +- tools/qfcc/source/options.c | 10 +- tools/qfcc/source/pragma.c | 12 +- tools/qfcc/source/qc-lex.l | 30 +- tools/qfcc/source/qc-parse.y | 36 +- tools/qfcc/source/qfcc.c | 50 +- tools/qfcc/source/qfprogs.c | 8 +- tools/qfcc/source/qp-lex.l | 20 +- tools/qfcc/source/qp-parse.y | 18 +- tools/qfcc/source/reloc.c | 18 +- tools/qfcc/source/shared.c | 16 +- tools/qfcc/source/statements.c | 29 +- tools/qfcc/source/strpool.c | 6 +- tools/qfcc/source/struct.c | 30 +- tools/qfcc/source/stub.c | 38 +- tools/qfcc/source/switch.c | 22 +- tools/qfcc/source/symtab.c | 20 +- tools/qfcc/source/type.c | 24 +- tools/qfcc/source/value.c | 22 +- tools/qfcc/test/Makefile.am | 615 ----------- tools/qfcc/test/Makemodule.am | 599 +++++++++++ tools/qfcc/test/build-run | 4 +- tools/qfcc/test/test-defspace.c | 14 +- tools/qfcc/test/test-defspace.h | 4 +- tools/qflight/Makefile.am | 7 - tools/qflight/Makemodule.am | 4 + tools/qflight/include/Makefile.am | 3 - tools/qflight/include/Makemodule.am | 7 + tools/qflight/source/Makefile.am | 20 - tools/qflight/source/Makemodule.am | 20 + tools/qflight/source/entities.c | 10 +- tools/qflight/source/ltface.c | 10 +- tools/qflight/source/noise.c | 2 +- tools/qflight/source/options.c | 6 +- tools/qflight/source/properties.c | 8 +- tools/qflight/source/qflight.c | 10 +- tools/qflight/source/threads.c | 6 +- tools/qflight/source/trace.c | 4 +- tools/qflight/source/vis.c | 8 +- tools/qflmp/Makefile.am | 18 - tools/qflmp/Makemodule.am | 14 + tools/qfmodelgen/Makefile.am | 7 - tools/qfmodelgen/Makemodule.am | 2 + tools/qfmodelgen/include/Makefile.am | 3 - tools/qfmodelgen/include/Makemodule.am | 3 + .../source/{Makefile.am => Makemodule.am} | 11 +- tools/qfmodelgen/source/lbmlib.c | 2 +- tools/qfmodelgen/source/modelgen.c | 5 +- tools/qfmodelgen/source/trilib.c | 2 +- .../{Makefile.am => Makemodule.am} | 8 +- tools/qfvis/Makefile.am | 7 - tools/qfvis/Makemodule.am | 4 + tools/qfvis/include/Makefile.am | 3 - tools/qfvis/include/Makemodule.am | 3 + tools/qfvis/source/Makefile.am | 17 - tools/qfvis/source/Makemodule.am | 16 + tools/qfvis/source/base-vis.c | 4 +- tools/qfvis/source/flow.c | 4 +- tools/qfvis/source/options.c | 4 +- tools/qfvis/source/qfvis.c | 4 +- tools/qfvis/source/soundphs.c | 2 +- tools/wad/Makefile.am | 19 - tools/wad/Makemodule.am | 13 + tools/wav/Makefile.am | 18 - tools/wav/Makemodule.am | 11 + vc2005/Makefile.am | 24 - vc2005/QuakeForge-VS8-Express.sln | 935 ----------------- vc2005/QuakeForge-VS8.sln | 966 ----------------- vc2005/bsp2img/bsp2img.vcproj | 567 ---------- vc2005/builtins/builtins.vcproj | 473 --------- vc2005/clean.ps1 | 3 - vc2005/common/common.vcproj | 489 --------- vc2005/console/console.vcproj | 493 --------- vc2005/console_client/console_client.vcproj | 481 --------- vc2005/console_server/console_server.vcproj | 469 --------- vc2005/engine/engine.vcproj | 509 --------- vc2005/gib/gib.vcproj | 537 ---------- vc2005/hw-master/hw-master.vcproj | 567 ---------- vc2005/image/image.vcproj | 481 --------- vc2005/include/config.h | 740 ------------- vc2005/models-sw/models-sw.vcproj | 511 --------- vc2005/models/models.vcproj | 489 --------- vc2005/modelsgl/modelsgl.vcproj | 521 ---------- vc2005/net-main/net-main.vcproj | 487 --------- vc2005/net/net.vcproj | 473 --------- vc2005/nq-common/nq-common.vcproj | 515 ---------- vc2005/nq-sdl/nq-sdl.vcproj | 561 ---------- vc2005/nq-sdl32/nq-sdl32.vcproj | 567 ---------- vc2005/nq-server/nq-server.vcproj | 571 ----------- vc2005/nq-sgl/nq-sgl.vcproj | 567 ---------- vc2005/nq-wgl/nq-wgl.vcproj | 567 ---------- vc2005/nq/nq.vcproj | 543 ---------- vc2005/pak/pak.vcproj | 571 ----------- vc2005/qfbsp/qfbsp.vcproj | 637 ------------ vc2005/qfcc/FlexBison.rules | 246 ----- vc2005/qfcc/qfcc.vcproj | 970 ------------------ vc2005/qfclient/qfclient.vcproj | 625 ----------- vc2005/qflight/qflight.vcproj | 625 ----------- vc2005/qfmodelgen/qfmodelgen.vcproj | 583 ----------- vc2005/qfprogs/qfprogs.vcproj | 595 ----------- vc2005/qfserver/qfserver.vcproj | 677 ------------ vc2005/qfvis/qfvis.vcproj | 593 ----------- vc2005/qfwavinfo/qfwavinfo.vcproj | 567 ---------- vc2005/qtv/qtv.vcproj | 599 ----------- vc2005/qw-client-sdl/qw-client-sdl.vcproj | 563 ---------- vc2005/qw-client-sdl32/qw-client-sdl32.vcproj | 567 ---------- vc2005/qw-client-sgl/qw-client-sgl.vcproj | 567 ---------- vc2005/qw-client-wgl/qw-client-wgl.vcproj | 563 ---------- vc2005/qw-master/qw-master.vcproj | 567 ---------- vc2005/qw/qw.vcproj | 473 --------- vc2005/readme.txt | 27 - vc2005/ruamoko/ruamoko.vcproj | 517 ---------- vc2005/sound/sound.vcproj | 513 --------- vc2005/util/util.vcproj | 617 ----------- vc2005/video-sdl/video-sdl.vcproj | 471 --------- vc2005/video-sgl/video-sgl.vcproj | 467 --------- vc2005/video-sw/video-sw.vcproj | 595 ----------- vc2005/video-sw32/video-sw32.vcproj | 571 ----------- vc2005/video-wgl/video-wgl.vcproj | 471 --------- vc2005/video/video.vcproj | 537 ---------- vc2005/videogl/videogl.vcproj | 555 ---------- vc2005/wad/wad.vcproj | 579 ----------- vc2008/Makefile.am | 24 - vc2008/QuakeForge.sln | 966 ----------------- vc2008/bsp2img/bsp2img.vcproj | 562 ---------- vc2008/builtins/builtins.vcproj | 474 --------- vc2008/clean.ps1 | 3 - vc2008/common/common.vcproj | 490 --------- vc2008/console/console.vcproj | 494 --------- vc2008/console_client/console_client.vcproj | 482 --------- vc2008/console_server/console_server.vcproj | 470 --------- vc2008/engine/engine.vcproj | 510 --------- vc2008/gib/gib.vcproj | 538 ---------- vc2008/hw-master/hw-master.vcproj | 562 ---------- vc2008/image/image.vcproj | 482 --------- vc2008/include/config.h | 740 ------------- vc2008/models-sw/models-sw.vcproj | 512 --------- vc2008/models/models.vcproj | 490 --------- vc2008/modelsgl/modelsgl.vcproj | 522 ---------- vc2008/net-main/net-main.vcproj | 488 --------- vc2008/net/net.vcproj | 474 --------- vc2008/nq-common/nq-common.vcproj | 516 ---------- vc2008/nq-sdl/nq-sdl.vcproj | 556 ---------- vc2008/nq-sdl32/nq-sdl32.vcproj | 562 ---------- vc2008/nq-server/nq-server.vcproj | 566 ---------- vc2008/nq-sgl/nq-sgl.vcproj | 562 ---------- vc2008/nq-wgl/nq-wgl.vcproj | 562 ---------- vc2008/nq/nq.vcproj | 544 ---------- vc2008/pak/pak.vcproj | 566 ---------- vc2008/qfbsp/qfbsp.vcproj | 632 ------------ vc2008/qfcc/FlexBison.rules | 246 ----- vc2008/qfcc/qfcc.vcproj | 965 ----------------- vc2008/qfclient/qfclient.vcproj | 626 ----------- vc2008/qflight/qflight.vcproj | 620 ----------- vc2008/qfmodelgen/qfmodelgen.vcproj | 578 ----------- vc2008/qfprogs/qfprogs.vcproj | 590 ----------- vc2008/qfserver/qfserver.vcproj | 672 ------------ vc2008/qfvis/qfvis.vcproj | 588 ----------- vc2008/qfwavinfo/qfwavinfo.vcproj | 562 ---------- vc2008/qtv/qtv.vcproj | 594 ----------- vc2008/qw-client-sdl/qw-client-sdl.vcproj | 558 ---------- vc2008/qw-client-sdl32/qw-client-sdl32.vcproj | 562 ---------- vc2008/qw-client-sgl/qw-client-sgl.vcproj | 562 ---------- vc2008/qw-client-wgl/qw-client-wgl.vcproj | 558 ---------- vc2008/qw-master/qw-master.vcproj | 562 ---------- vc2008/qw/qw.vcproj | 474 --------- vc2008/readme.txt | 25 - vc2008/ruamoko/ruamoko.vcproj | 518 ---------- vc2008/sound/sound.vcproj | 514 ---------- vc2008/util/util.vcproj | 618 ----------- vc2008/video-sdl/video-sdl.vcproj | 472 --------- vc2008/video-sgl/video-sgl.vcproj | 468 --------- vc2008/video-sw/video-sw.vcproj | 596 ----------- vc2008/video-sw32/video-sw32.vcproj | 572 ----------- vc2008/video-wgl/video-wgl.vcproj | 472 --------- vc2008/video/video.vcproj | 538 ---------- vc2008/videogl/videogl.vcproj | 556 ---------- vc2008/wad/wad.vcproj | 574 ----------- 535 files changed, 4528 insertions(+), 64841 deletions(-) delete mode 100644 RPM/Makefile.am create mode 100644 RPM/Makemodule.am delete mode 100644 debian/Makefile.am create mode 100644 debian/Makemodule.am delete mode 100644 desktop/Makefile.am create mode 100644 desktop/Makemodule.am delete mode 100644 desktop/quakeforge-nq-glx.desktop delete mode 100644 desktop/quakeforge-nq-sdl32.desktop delete mode 100644 desktop/quakeforge-nq-sgl.desktop delete mode 100644 desktop/quakeforge-qw-glx.desktop delete mode 100644 desktop/quakeforge-qw-sdl32.desktop delete mode 100644 desktop/quakeforge-qw-sgl.desktop delete mode 100644 doc/Makefile.am create mode 100644 doc/Makemodule.am delete mode 100644 doc/man/Makefile.am delete mode 100644 hw/Makefile.am create mode 100644 hw/Makemodule.am delete mode 100644 hw/include/Makefile.am rename hw/source/{Makefile.am => Makemodule.am} (69%) delete mode 100644 include/Makefile.am create mode 100644 include/Makemodule.am delete mode 100644 include/QF/Makefile.am create mode 100644 include/QF/Makemodule.am delete mode 100644 libs/Makefile.am create mode 100644 libs/Makemodule.am delete mode 100644 libs/audio/Makefile.am create mode 100644 libs/audio/Makemodule.am delete mode 100644 libs/audio/renderer/Makefile.am create mode 100644 libs/audio/renderer/Makemodule.am delete mode 100644 libs/audio/targets/Makefile.am create mode 100644 libs/audio/targets/Makemodule.am delete mode 100644 libs/client/Makefile.am create mode 100644 libs/client/Makemodule.am delete mode 100644 libs/console/Makefile.am create mode 100644 libs/console/Makemodule.am delete mode 100644 libs/gamecode/Makefile.am create mode 100644 libs/gamecode/Makemodule.am delete mode 100644 libs/gib/Makefile.am create mode 100644 libs/gib/Makemodule.am delete mode 100644 libs/image/Makefile.am create mode 100644 libs/image/Makemodule.am delete mode 100644 libs/models/Makefile.am create mode 100644 libs/models/Makemodule.am delete mode 100644 libs/models/alias/Makefile.am create mode 100644 libs/models/alias/Makemodule.am delete mode 100644 libs/models/brush/Makefile.am create mode 100644 libs/models/brush/Makemodule.am delete mode 100644 libs/models/iqm/Makefile.am create mode 100644 libs/models/iqm/Makemodule.am delete mode 100644 libs/models/sprite/Makefile.am create mode 100644 libs/models/sprite/Makemodule.am delete mode 100644 libs/models/test/Makefile.am create mode 100644 libs/models/test/Makemodule.am delete mode 100644 libs/net/Makefile.am create mode 100644 libs/net/Makemodule.am delete mode 100644 libs/net/nc/Makefile.am create mode 100644 libs/net/nc/Makemodule.am delete mode 100644 libs/net/nm/Makefile.am create mode 100644 libs/net/nm/Makemodule.am delete mode 100644 libs/qw/Makefile.am create mode 100644 libs/qw/Makemodule.am delete mode 100644 libs/ruamoko/Makefile.am create mode 100644 libs/ruamoko/Makemodule.am delete mode 100644 libs/util/Makefile.am create mode 100644 libs/util/Makemodule.am delete mode 100644 libs/util/test/Makefile.am create mode 100644 libs/util/test/Makemodule.am delete mode 100644 libs/video/Makefile.am create mode 100644 libs/video/Makemodule.am delete mode 100644 libs/video/renderer/Makefile.am create mode 100644 libs/video/renderer/Makemodule.am delete mode 100644 libs/video/renderer/gl/Makefile.am delete mode 100644 libs/video/renderer/glsl/Makefile.am delete mode 100644 libs/video/renderer/sw/Makefile.am delete mode 100644 libs/video/renderer/sw32/Makefile.am delete mode 100644 libs/video/targets/Makefile.am create mode 100644 libs/video/targets/Makemodule.am delete mode 100644 nq/Makefile.am create mode 100644 nq/Makemodule.am delete mode 100644 nq/include/Makefile.am create mode 100644 nq/include/Makemodule.am delete mode 100644 nq/source/Makefile.am create mode 100644 nq/source/Makemodule.am delete mode 100644 pkg-config/Makefile.am create mode 100644 pkg-config/Makemodule.am delete mode 100644 qtv/Makefile.am create mode 100644 qtv/Makemodule.am delete mode 100644 qtv/include/Makefile.am create mode 100644 qtv/include/Makemodule.am rename qtv/source/{Makefile.am => Makemodule.am} (61%) delete mode 100644 qw/Makefile.am create mode 100644 qw/Makemodule.am delete mode 100644 qw/include/Makefile.am create mode 100644 qw/include/Makemodule.am delete mode 100644 qw/source/Makefile.am create mode 100644 qw/source/Makemodule.am delete mode 100644 ruamoko/Makefile.am create mode 100644 ruamoko/Makemodule.am delete mode 100644 ruamoko/cl_menu/Makefile.am create mode 100644 ruamoko/cl_menu/Makemodule.am delete mode 100644 ruamoko/game/Makefile.am create mode 100644 ruamoko/game/Makemodule.am delete mode 100644 ruamoko/gui/Makefile.am create mode 100644 ruamoko/gui/Makemodule.am delete mode 100644 ruamoko/include/Makefile.am create mode 100644 ruamoko/include/Makemodule.am delete mode 100644 ruamoko/lib/Makefile.am create mode 100644 ruamoko/lib/Makemodule.am delete mode 100644 ruamoko/qwaq/Makefile.am create mode 100644 ruamoko/qwaq/Makemodule.am delete mode 100644 ruamoko/scheme/Makefile.am create mode 100644 ruamoko/scheme/Makemodule.am delete mode 100644 tools/Makefile.am create mode 100644 tools/Makemodule.am rename tools/bsp2img/{Makefile.am => Makemodule.am} (60%) delete mode 100644 tools/carne/Makefile.am create mode 100644 tools/carne/Makemodule.am delete mode 100644 tools/pak/Makefile.am create mode 100644 tools/pak/Makemodule.am delete mode 100644 tools/qfbsp/Makefile.am create mode 100644 tools/qfbsp/Makemodule.am delete mode 100644 tools/qfbsp/include/Makefile.am create mode 100644 tools/qfbsp/include/Makemodule.am delete mode 100644 tools/qfbsp/source/Makefile.am create mode 100644 tools/qfbsp/source/Makemodule.am delete mode 100644 tools/qfcc/Makefile.am create mode 100644 tools/qfcc/Makemodule.am delete mode 100755 tools/qfcc/bootstrap delete mode 100644 tools/qfcc/configure.in delete mode 100644 tools/qfcc/doc/Makefile.am create mode 100644 tools/qfcc/doc/Makemodule.am delete mode 100644 tools/qfcc/doc/man/Makefile.am delete mode 100644 tools/qfcc/include/Makefile.am create mode 100644 tools/qfcc/include/Makemodule.am delete mode 100644 tools/qfcc/source/Makefile.am create mode 100644 tools/qfcc/source/Makemodule.am delete mode 100644 tools/qfcc/test/Makefile.am create mode 100644 tools/qfcc/test/Makemodule.am delete mode 100644 tools/qflight/Makefile.am create mode 100644 tools/qflight/Makemodule.am delete mode 100644 tools/qflight/include/Makefile.am create mode 100644 tools/qflight/include/Makemodule.am delete mode 100644 tools/qflight/source/Makefile.am create mode 100644 tools/qflight/source/Makemodule.am delete mode 100644 tools/qflmp/Makefile.am create mode 100644 tools/qflmp/Makemodule.am delete mode 100644 tools/qfmodelgen/Makefile.am create mode 100644 tools/qfmodelgen/Makemodule.am delete mode 100644 tools/qfmodelgen/include/Makefile.am create mode 100644 tools/qfmodelgen/include/Makemodule.am rename tools/qfmodelgen/source/{Makefile.am => Makemodule.am} (54%) rename tools/qfspritegen/{Makefile.am => Makemodule.am} (57%) delete mode 100644 tools/qfvis/Makefile.am create mode 100644 tools/qfvis/Makemodule.am delete mode 100644 tools/qfvis/include/Makefile.am create mode 100644 tools/qfvis/include/Makemodule.am delete mode 100644 tools/qfvis/source/Makefile.am create mode 100644 tools/qfvis/source/Makemodule.am delete mode 100644 tools/wad/Makefile.am create mode 100644 tools/wad/Makemodule.am delete mode 100644 tools/wav/Makefile.am create mode 100644 tools/wav/Makemodule.am delete mode 100644 vc2005/Makefile.am delete mode 100644 vc2005/QuakeForge-VS8-Express.sln delete mode 100644 vc2005/QuakeForge-VS8.sln delete mode 100644 vc2005/bsp2img/bsp2img.vcproj delete mode 100644 vc2005/builtins/builtins.vcproj delete mode 100644 vc2005/clean.ps1 delete mode 100644 vc2005/common/common.vcproj delete mode 100644 vc2005/console/console.vcproj delete mode 100644 vc2005/console_client/console_client.vcproj delete mode 100644 vc2005/console_server/console_server.vcproj delete mode 100644 vc2005/engine/engine.vcproj delete mode 100644 vc2005/gib/gib.vcproj delete mode 100644 vc2005/hw-master/hw-master.vcproj delete mode 100644 vc2005/image/image.vcproj delete mode 100644 vc2005/include/config.h delete mode 100644 vc2005/models-sw/models-sw.vcproj delete mode 100644 vc2005/models/models.vcproj delete mode 100644 vc2005/modelsgl/modelsgl.vcproj delete mode 100644 vc2005/net-main/net-main.vcproj delete mode 100644 vc2005/net/net.vcproj delete mode 100644 vc2005/nq-common/nq-common.vcproj delete mode 100644 vc2005/nq-sdl/nq-sdl.vcproj delete mode 100644 vc2005/nq-sdl32/nq-sdl32.vcproj delete mode 100644 vc2005/nq-server/nq-server.vcproj delete mode 100644 vc2005/nq-sgl/nq-sgl.vcproj delete mode 100644 vc2005/nq-wgl/nq-wgl.vcproj delete mode 100644 vc2005/nq/nq.vcproj delete mode 100644 vc2005/pak/pak.vcproj delete mode 100644 vc2005/qfbsp/qfbsp.vcproj delete mode 100644 vc2005/qfcc/FlexBison.rules delete mode 100644 vc2005/qfcc/qfcc.vcproj delete mode 100644 vc2005/qfclient/qfclient.vcproj delete mode 100644 vc2005/qflight/qflight.vcproj delete mode 100644 vc2005/qfmodelgen/qfmodelgen.vcproj delete mode 100644 vc2005/qfprogs/qfprogs.vcproj delete mode 100644 vc2005/qfserver/qfserver.vcproj delete mode 100644 vc2005/qfvis/qfvis.vcproj delete mode 100644 vc2005/qfwavinfo/qfwavinfo.vcproj delete mode 100644 vc2005/qtv/qtv.vcproj delete mode 100644 vc2005/qw-client-sdl/qw-client-sdl.vcproj delete mode 100644 vc2005/qw-client-sdl32/qw-client-sdl32.vcproj delete mode 100644 vc2005/qw-client-sgl/qw-client-sgl.vcproj delete mode 100644 vc2005/qw-client-wgl/qw-client-wgl.vcproj delete mode 100644 vc2005/qw-master/qw-master.vcproj delete mode 100644 vc2005/qw/qw.vcproj delete mode 100644 vc2005/readme.txt delete mode 100644 vc2005/ruamoko/ruamoko.vcproj delete mode 100644 vc2005/sound/sound.vcproj delete mode 100644 vc2005/util/util.vcproj delete mode 100644 vc2005/video-sdl/video-sdl.vcproj delete mode 100644 vc2005/video-sgl/video-sgl.vcproj delete mode 100644 vc2005/video-sw/video-sw.vcproj delete mode 100644 vc2005/video-sw32/video-sw32.vcproj delete mode 100644 vc2005/video-wgl/video-wgl.vcproj delete mode 100644 vc2005/video/video.vcproj delete mode 100644 vc2005/videogl/videogl.vcproj delete mode 100644 vc2005/wad/wad.vcproj delete mode 100644 vc2008/Makefile.am delete mode 100644 vc2008/QuakeForge.sln delete mode 100644 vc2008/bsp2img/bsp2img.vcproj delete mode 100644 vc2008/builtins/builtins.vcproj delete mode 100644 vc2008/clean.ps1 delete mode 100644 vc2008/common/common.vcproj delete mode 100644 vc2008/console/console.vcproj delete mode 100644 vc2008/console_client/console_client.vcproj delete mode 100644 vc2008/console_server/console_server.vcproj delete mode 100644 vc2008/engine/engine.vcproj delete mode 100644 vc2008/gib/gib.vcproj delete mode 100644 vc2008/hw-master/hw-master.vcproj delete mode 100644 vc2008/image/image.vcproj delete mode 100644 vc2008/include/config.h delete mode 100644 vc2008/models-sw/models-sw.vcproj delete mode 100644 vc2008/models/models.vcproj delete mode 100644 vc2008/modelsgl/modelsgl.vcproj delete mode 100644 vc2008/net-main/net-main.vcproj delete mode 100644 vc2008/net/net.vcproj delete mode 100644 vc2008/nq-common/nq-common.vcproj delete mode 100644 vc2008/nq-sdl/nq-sdl.vcproj delete mode 100644 vc2008/nq-sdl32/nq-sdl32.vcproj delete mode 100644 vc2008/nq-server/nq-server.vcproj delete mode 100644 vc2008/nq-sgl/nq-sgl.vcproj delete mode 100644 vc2008/nq-wgl/nq-wgl.vcproj delete mode 100644 vc2008/nq/nq.vcproj delete mode 100644 vc2008/pak/pak.vcproj delete mode 100644 vc2008/qfbsp/qfbsp.vcproj delete mode 100644 vc2008/qfcc/FlexBison.rules delete mode 100644 vc2008/qfcc/qfcc.vcproj delete mode 100644 vc2008/qfclient/qfclient.vcproj delete mode 100644 vc2008/qflight/qflight.vcproj delete mode 100644 vc2008/qfmodelgen/qfmodelgen.vcproj delete mode 100644 vc2008/qfprogs/qfprogs.vcproj delete mode 100644 vc2008/qfserver/qfserver.vcproj delete mode 100644 vc2008/qfvis/qfvis.vcproj delete mode 100644 vc2008/qfwavinfo/qfwavinfo.vcproj delete mode 100644 vc2008/qtv/qtv.vcproj delete mode 100644 vc2008/qw-client-sdl/qw-client-sdl.vcproj delete mode 100644 vc2008/qw-client-sdl32/qw-client-sdl32.vcproj delete mode 100644 vc2008/qw-client-sgl/qw-client-sgl.vcproj delete mode 100644 vc2008/qw-client-wgl/qw-client-wgl.vcproj delete mode 100644 vc2008/qw-master/qw-master.vcproj delete mode 100644 vc2008/qw/qw.vcproj delete mode 100644 vc2008/readme.txt delete mode 100644 vc2008/ruamoko/ruamoko.vcproj delete mode 100644 vc2008/sound/sound.vcproj delete mode 100644 vc2008/util/util.vcproj delete mode 100644 vc2008/video-sdl/video-sdl.vcproj delete mode 100644 vc2008/video-sgl/video-sgl.vcproj delete mode 100644 vc2008/video-sw/video-sw.vcproj delete mode 100644 vc2008/video-sw32/video-sw32.vcproj delete mode 100644 vc2008/video-wgl/video-wgl.vcproj delete mode 100644 vc2008/video/video.vcproj delete mode 100644 vc2008/videogl/videogl.vcproj delete mode 100644 vc2008/wad/wad.vcproj diff --git a/Makefile.am b/Makefile.am index 1b33ee233..9e68af2a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,9 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS=desktop pkg-config include @top_dirs@ -DIST_SUBDIRS=desktop pkg-config include \ - libs hw nq qtv qw tools ruamoko\ - RPM debian doc vc2005 vc2008 - -## configure.ac needs to be listed here for older autoconfs -EXTRA_DIST= ChangeLog configure.ac bootstrap \ +EXTRA_DIST = \ + ChangeLog configure.ac bootstrap \ $(top_srcdir)/.version \ config.d/git-version-gen \ tools/cross/droid/cross-configure.sh \ @@ -26,9 +20,109 @@ EXTRA_DIST= ChangeLog configure.ac bootstrap \ tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \ tools/gas2masm/gas2masm.mak tools/gas2masm/gas2masm.mdp -NOCONV_DIST= $(distdir)/include/win32/resources/icon1Vista.ico \ +NOCONV_DIST= \ + $(distdir)/include/win32/resources/icon1Vista.ico \ $(distdir)/include/win32/resources/icon1XP.ico +BUILT_SOURCES = $(top_srcdir)/.version +#AM_CFLAGS= @PREFER_NON_PIC@ +AM_CPPFLAGS= -I$(top_srcdir)/include $(PTHREAD_CFLAGS) + +common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@ + +TESTS = +XFAIL_TESTS = +bin_PROGRAMS = +bin_SCRIPTS = +check_PROGRAMS = +lib_LTLIBRARIES = +man_MANS = +noinst_LTLIBRARIES = +noinst_LIBRARIES = +noinst_PROGRAMS = +noinst_HEADERS = +plugin_LTLIBRARIES = + +RANLIB=touch + +EXTRA_HEADERS = +EXTRA_LTLIBRARIES = +EXTRA_PROGRAMS = +EXTRA_LIBRARIES = + +CLEANFILES = +DISTCLEANFILES = + +YFLAGS = -v -d -Wno-yacc -Werror +PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@ +PTHREAD_CFLAGS=@PTHREAD_CFLAGS@ + +lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ + -rpath $(libdir) -no-undefined +plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir) +plugin_libadd= @plugin_libadd@ + +SDL_LIBS= @SDL_LIBS@ +XMMS_LIBS= @XMMS_LIBS@ + +PAK=$(top_builddir)/pak$(EXEEXT) +QFCC_DEP=qfcc$(EXEEXT) +QFCC=$(top_builddir)/$(QFCC_DEP) +GZ=@progs_gz@ + +QCSYSTEM=--no-default-paths -I$(top_srcdir) -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include +QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide +QCPPFLAGS=$(QCSYSTEM) +QCLINKFLAGS=--no-default-paths -Lruamoko/lib +QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS) +QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS) +MKDIR_P = @MKDIR_P@ + +am__mv = mv -f + +SUFFIXES=.o .r .pas +.r.o: + depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ + $(QCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\ + sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\ + $(am__mv) $$depbase.Tqo $$depbase.Qo +.pas.o: + depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ + $(QCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tqo -c -o $@ $< &&\ + sed -i -e '1s@:@: $(QFCC_DEP)@' $$depbase.Tqo &&\ + $(am__mv) $$depbase.Tqo $$depbase.Qo + +qcautodep = $(join $(addsuffix $(DEPDIR)/,$(dir $(basename $(1)))),$(addsuffix .Qo,$(notdir $(basename $(basename $(1)))))) +r_depfiles_remade= +pas_depfiles_remade= + +include doc/Makemodule.am +include RPM/Makemodule.am +include debian/Makemodule.am +include desktop/Makemodule.am +include pkg-config/Makemodule.am +include include/Makemodule.am +include libs/Makemodule.am +include hw/Makemodule.am +include nq/Makemodule.am +include qtv/Makemodule.am +include qw/Makemodule.am +include tools/Makemodule.am +include ruamoko/Makemodule.am + +DISTCLEANFILES += $(r_depfiles_remade) $(pas_depfiles_remade) + +$(r_depfiles_remade): + $(MKDIR_P) $(@D) + echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.r qfcc@' >$@-t && $(am__mv) $@-t $@ + +$(pas_depfiles_remade): + $(MKDIR_P) $(@D) + echo '$@' | sed -e 's@\$(DEPDIR)/@@' -e 's@\(.*\)\.Qo$$@\1.o: $(top_srcdir)/\1.pas qfcc@' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) $(pas_depfiles_remade) + echo findme $(ruamoko_gui_libgui_a_dep) + changelog: ChangeLog ChangeLog: FORCE @if test -d "$(top_srcdir)/.git"; then \ @@ -63,7 +157,6 @@ dist-all-local: distdir ZIP="-r9ql" zip $(distdir).zip $(distdir) -rm -rf $(distdir) -BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ dist-hook: diff --git a/RPM/Makefile.am b/RPM/Makefile.am deleted file mode 100644 index 13616e183..000000000 --- a/RPM/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign - -EXTRA_DIST= build_rpm.in quakeforge.conf.in quakeforge.spec.in - -rpm: build_rpm quakeforge.conf quakeforge.spec - ./build_rpm - -CLEANFILES = *.rpm diff --git a/RPM/Makemodule.am b/RPM/Makemodule.am new file mode 100644 index 000000000..583cc8506 --- /dev/null +++ b/RPM/Makemodule.am @@ -0,0 +1,6 @@ +EXTRA_DIST += RPM/build_rpm.in RPM/quakeforge.conf.in RPM/quakeforge.spec.in + +rpm: RPM/build_rpm RPM/quakeforge.conf RPM/quakeforge.spec + cd RPM && ./build_rpm + +CLEANFILES += rpm/*.rpm diff --git a/bootstrap b/bootstrap index 4986a6ca4..abd34252f 100755 --- a/bootstrap +++ b/bootstrap @@ -18,7 +18,7 @@ if test "$1" = "clean"; then find . -name '*.orig' -type f -print0 | xargs $ARGS rm -f rm -f aclocal.m4 build-stamp changelog-stamp config.cache config.log \ config.status configure configure-stamp install-sh libtool missing \ - mkinstalldirs quakeforge-config quakeforge.lsm + mkinstalldirs quakeforge-config quakeforge.lsm test-driver rm -f compile config.guess config.sub depcomp ltmain.sh ylwrap rm -rf autom4te.cache rm -f m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 \ diff --git a/config.d/ac_config_files.m4 b/config.d/ac_config_files.m4 index 6f49d4bb5..d84505483 100644 --- a/config.d/ac_config_files.m4 +++ b/config.d/ac_config_files.m4 @@ -1,102 +1,4 @@ Makefile - - include/Makefile - include/QF/Makefile - - libs/Makefile - libs/audio/Makefile - libs/audio/targets/Makefile - libs/audio/renderer/Makefile - libs/audio/test/Makefile - libs/console/Makefile - libs/client/Makefile - libs/gamecode/Makefile - libs/gib/Makefile - libs/image/Makefile - libs/models/Makefile - libs/models/alias/Makefile - libs/models/brush/Makefile - libs/models/iqm/Makefile - libs/models/sprite/Makefile - libs/models/test/Makefile - libs/net/Makefile - libs/net/nc/Makefile - libs/net/nm/Makefile - libs/qw/Makefile - libs/ruamoko/Makefile - libs/util/Makefile - libs/util/test/Makefile - libs/video/Makefile - libs/video/renderer/Makefile - libs/video/renderer/gl/Makefile - libs/video/renderer/glsl/Makefile - libs/video/renderer/sw/Makefile - libs/video/renderer/sw32/Makefile - libs/video/targets/Makefile - - hw/Makefile - hw/include/Makefile - hw/source/Makefile - - nq/Makefile - nq/include/Makefile - nq/source/Makefile - - qtv/Makefile - qtv/include/Makefile - qtv/source/Makefile - - qw/Makefile - qw/include/Makefile - qw/source/Makefile - - tools/Makefile - tools/bsp2img/Makefile - tools/carne/Makefile - tools/pak/Makefile - tools/qfbsp/Makefile - tools/qfbsp/include/Makefile - tools/qfbsp/source/Makefile - tools/qfcc/Makefile - tools/qfcc/doc/Makefile - tools/qfcc/doc/man/Makefile - tools/qfcc/include/Makefile - tools/qfcc/source/Makefile - tools/qfcc/test/Makefile - tools/qflight/Makefile - tools/qflight/include/Makefile - tools/qflight/source/Makefile - tools/qflmp/Makefile - tools/qfmodelgen/Makefile - tools/qfmodelgen/include/Makefile - tools/qfmodelgen/source/Makefile - tools/qfspritegen/Makefile - tools/qfvis/Makefile - tools/qfvis/include/Makefile - tools/qfvis/source/Makefile - tools/wad/Makefile - tools/wav/Makefile - - ruamoko/Makefile - ruamoko/Doxyfile - ruamoko/include/Makefile - ruamoko/lib/Makefile - ruamoko/game/Makefile - ruamoko/gui/Makefile - ruamoko/cl_menu/Makefile - ruamoko/scheme/Makefile - ruamoko/qwaq/Makefile - - pkg-config/Makefile pkg-config/qfcc.pc pkg-config/quakeforge.pc - - doc/Makefile doc/quakeforge.dox.conf - doc/man/Makefile - - debian/Makefile - desktop/Makefile - - vc2005/Makefile - vc2008/Makefile diff --git a/config.d/build_control.m4 b/config.d/build_control.m4 index 88b58e610..34227595f 100644 --- a/config.d/build_control.m4 +++ b/config.d/build_control.m4 @@ -39,7 +39,7 @@ if test "x$HAVE_FBDEV" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-fbdev\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-fbdev\$(EXEEXT)" CL_TARGETS="$CL_TARGETS FBDEV" - VID_TARGETS="$VID_TARGETS libQFfbdev.la" + VID_TARGETS="$VID_TARGETS libs/video/targets/libQFfbdev.la" QF_NEED(vid_render, [sw]) QF_NEED(models, [sw]) QF_NEED(alias, [sw]) @@ -66,11 +66,11 @@ if test "x$HAVE_X" = xyes; then if test "x$ENABLE_clients_x11" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-x11\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-x11\$(EXEEXT)" - QWAQ_TARGETS="$QWAQ_TARGETS qwaq-x11\$(EXEEXT)" - QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-x11.desktop" - NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-x11.desktop" + QWAQ_TARGETS="$QWAQ_TARGETS ruamoko/qwaq/qwaq-x11\$(EXEEXT)" + QW_DESKTOP_DATA="$QW_DESKTOP_DATA desktop/quakeforge-qw-x11.desktop" + NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA desktop/quakeforge-nq-x11.desktop" CL_TARGETS="$CL_TARGETS X11" - VID_TARGETS="$VID_TARGETS libQFx11.la" + VID_TARGETS="$VID_TARGETS libs/video/targets/libQFx11.la" QF_NEED(vid_render, [sw sw32 gl glsl]) QF_NEED(models, [sw gl glsl]) QF_NEED(alias, [sw gl glsl]) @@ -91,10 +91,10 @@ if test "x$HAVE_SDL" = xyes; then if test "x$ENABLE_clients_sdl" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-sdl\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-sdl\$(EXEEXT)" - QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-sdl.desktop" - NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-sdl.desktop" + QW_DESKTOP_DATA="$QW_DESKTOP_DATA desktop/quakeforge-qw-sdl.desktop" + NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA desktop/quakeforge-nq-sdl.desktop" CL_TARGETS="$CL_TARGETS SDL" - VID_TARGETS="$VID_TARGETS libQFsdl.la" + VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsdl.la" QF_NEED(vid_render, [sw sw32 gl glsl]) QF_NEED(models, [sw gl glsl]) QF_NEED(alias, [sw gl glsl]) @@ -116,7 +116,7 @@ if test "x$HAVE_SVGA" = xyes; then QW_TARGETS="$QW_TARGETS qw-client-svga\$(EXEEXT)" NQ_TARGETS="$NQ_TARGETS nq-svga\$(EXEEXT)" CL_TARGETS="$CL_TARGETS SVGAlib" - VID_TARGETS="$VID_TARGETS libQFsvga.la" + VID_TARGETS="$VID_TARGETS libs/video/targets/libQFsvga.la" QF_NEED(vid_render, [sw]) QF_NEED(models, [sw]) QF_NEED(alias, [sw]) @@ -138,7 +138,7 @@ fi # QW_TARGETS="$QW_TARGETS qw-client-wgl\$(EXEEXT)" # NQ_TARGETS="$NQ_TARGETS nq-wgl\$(EXEEXT)" # CL_TARGETS="$CL_TARGETS WGL" -# VID_TARGETS="$VID_TARGETS libQFwgl.la" +# VID_TARGETS="$VID_TARGETS libs/video/targets/libQFwgl.la" # QF_NEED(vid_render, [gl]) # QF_NEED(models, [gl]) # QF_NEED(alias, [gl]) @@ -163,8 +163,8 @@ if test "x$ENABLE_servers_nq" = xyes; then QF_NEED(libs,[util gamecode ruamoko gib image models console net]) fi if test "x$ENABLE_servers_qtv" = xyes; then - QTV_TARGETS="qtv\$(EXEEXT) $QTV_TARGETS" - SV_TARGETS="$SV_TARGETS qtv" + QTV_TARGETS="qtv-server\$(EXEEXT) $QTV_TARGETS" + SV_TARGETS="$SV_TARGETS qtv-server" # QF_NEED(qtv, [common server]) QF_NEED(console, [server]) QF_NEED(top, [qtv]) @@ -228,7 +228,7 @@ if test "x$ENABLE_tools_qfvis" = xyes; then fi if test "x$ENABLE_tools_qwaq" = xyes; then if test "x$HAVE_PANEL" = xyes -a "x$HAVE_PTHREAD" = xyes; then - QWAQ_TARGETS="$QWAQ_TARGETS qwaq-curses\$(EXEEXT)" + QWAQ_TARGETS="$QWAQ_TARGETS ruamoko/qwaq/qwaq-curses\$(EXEEXT)" fi QF_NEED(tools,[qfcc]) QF_NEED(ruamoko,[qwaq]) @@ -254,14 +254,22 @@ QF_PROCESS_NEED_DIRS(ruamoko,[qwaq]) if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then QF_NEED(top, [ruamoko]) - qfcc_include_qf="\$(qfcc_include_qf)" + qfac_qfcc_include_qf="\$(qfcc_include_qf)" fi -QF_SUBST(qfcc_include_qf) +QF_SUBST(qfac_qfcc_include_qf) if test x"${top_need_libs}" = xyes; then - include_qf="\$(include_qf)" + qfac_include_qf="\$(include_qf)" + qfac_include_qf_gl="\$(include_qf_gl)" + qfac_include_qf_glsl="\$(include_qf_glsl)" + qfac_include_qf_math="\$(include_qf_math)" + qfac_include_qf_plugin="\$(include_qf_plugin)" fi -QF_SUBST(include_qf) +QF_SUBST(qfac_include_qf) +QF_SUBST(qfac_include_qf_gl) +QF_SUBST(qfac_include_qf_glsl) +QF_SUBST(qfac_include_qf_math) +QF_SUBST(qfac_include_qf_plugin) progs_gz= if test "$HAVE_ZLIB" = "yes"; then @@ -273,21 +281,21 @@ QF_PROCESS_NEED_DIRS(top, [libs hw nq qtv qw tools ruamoko]) QF_PROCESS_NEED_LIBS(swrend, [asm]) QF_PROCESS_NEED_DIRS(vid_render, [gl glsl sw sw32]) -QF_PROCESS_NEED_LIBS(models, [gl glsl sw]) -QF_PROCESS_NEED_LIBS(alias, [gl glsl sw]) -QF_PROCESS_NEED_LIBS(brush, [gl glsl sw]) -QF_PROCESS_NEED_LIBS(iqm, [gl glsl sw]) -QF_PROCESS_NEED_LIBS(sprite, [gl glsl sw]) +QF_PROCESS_NEED_LIBS(models, [gl glsl sw], [libs/models]) +QF_PROCESS_NEED_LIBS(alias, [gl glsl sw], [libs/models/alias]) +QF_PROCESS_NEED_LIBS(brush, [gl glsl sw], [libs/models/brush]) +QF_PROCESS_NEED_LIBS(iqm, [gl glsl sw], [libs/models/iqm]) +QF_PROCESS_NEED_LIBS(sprite, [gl glsl sw], [libs/models/sprite]) -QF_PROCESS_NEED_LIBS(vid, [common sdl svga x11]) -QF_PROCESS_NEED_LIBS(qw, [client common sdl server], a) -QF_PROCESS_NEED_LIBS(nq, [client common sdl server], a) +QF_PROCESS_NEED_LIBS(vid, [common sdl svga x11], [libs/video/targets]) +QF_PROCESS_NEED_LIBS(qw, [client common sdl server], [qw/source], a) +QF_PROCESS_NEED_LIBS(nq, [client common sdl server], [nq/source], a) if test -n "$CL_TARGETS"; then - CD_TARGETS="libQFcd.la" - SND_TARGETS="libQFsound.la" + CD_TARGETS="libs/audio/libQFcd.la" + SND_TARGETS="libs/audio/libQFsound.la" AUDIO_TARGETS="testsound\$(EXEEXT)" - JOY_TARGETS="libQFjs.la" + JOY_TARGETS="libs/video/targets/libQFjs.la" else unset CDTYPE unset SOUND_TYPES @@ -322,13 +330,13 @@ if test "x$static_plugins" = xauto; then fi fi if test "x$static_plugins" = xyes; then - QF_PROCESS_NEED_STATIC_PLUGINS(vid_render, [sw sw32 glsl gl]) - QF_PROCESS_NEED_STATIC_PLUGINS(console, [server], [\$(top_builddir)/libs/console], [server]) - QF_PROCESS_NEED_STATIC_PLUGINS(console, [client], [\$(top_builddir)/libs/console], [client]) + QF_PROCESS_NEED_STATIC_PLUGINS(vid_render, [sw sw32 glsl gl], [libs/video/renderer]) + QF_PROCESS_NEED_STATIC_PLUGINS(console, [server], [libs/console], [server]) + QF_PROCESS_NEED_STATIC_PLUGINS(console, [client], [libs/console], [client]) - QF_PROCESS_NEED_STATIC_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa], [targets]) - QF_PROCESS_NEED_STATIC_PLUGINS(snd_render, [jack default], [renderer]) - QF_PROCESS_NEED_STATIC_PLUGINS(cd, [xmms sdl sgi win linux file]) + QF_PROCESS_NEED_STATIC_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa], [libs/audio/targets]) + QF_PROCESS_NEED_STATIC_PLUGINS(snd_render, [jack default], [libs/audio/renderer]) + QF_PROCESS_NEED_STATIC_PLUGINS(cd, [xmms sdl sgi win linux file], [libs/audio]) AC_DEFINE(STATIC_PLUGINS, 1, [Define this if you are building static plugins]) if test -n "$SOUND_TYPES"; then SOUND_TYPES="$SOUND_TYPES (static)" @@ -337,12 +345,12 @@ if test "x$static_plugins" = xyes; then CDTYPE="$CDTYPE (static)" fi else - QF_PROCESS_NEED_PLUGINS(vid_render, [sw sw32 glsl gl]) - QF_PROCESS_NEED_PLUGINS(console, [server], [server]) - QF_PROCESS_NEED_PLUGINS(console, [client], [client]) - QF_PROCESS_NEED_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa]) - QF_PROCESS_NEED_PLUGINS(snd_render, [jack default]) - QF_PROCESS_NEED_PLUGINS(cd, [xmms sdl sgi win linux file]) + QF_PROCESS_NEED_PLUGINS(vid_render, [sw sw32 glsl gl], [libs/video/renderer]) + QF_PROCESS_NEED_PLUGINS(console, [server], [libs/console], [server]) + QF_PROCESS_NEED_PLUGINS(console, [client], [libs/console], [client]) + QF_PROCESS_NEED_PLUGINS(snd_output, [sdl mme sgi sun win dx oss alsa], [libs/audio/targets]) + QF_PROCESS_NEED_PLUGINS(snd_render, [jack default], [libs/audio/renderer]) + QF_PROCESS_NEED_PLUGINS(cd, [xmms sdl sgi win linux file], [libs/audio]) fi dnl Do not use -module here, it belongs in makefile.am due to automake @@ -419,7 +427,7 @@ QF_DEPS(QFVIS, [$(WIN32_LIBS)], ) QF_DEPS(QWAQ, - [], + [-I$(top_srcdir)/ruamoko/qwaq], [$(top_builddir)/libs/ruamoko/libQFruamoko.la $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la], diff --git a/config.d/rpm.m4 b/config.d/rpm.m4 index 95ac34cf7..d4406cf2a 100644 --- a/config.d/rpm.m4 +++ b/config.d/rpm.m4 @@ -1,2 +1,2 @@ -AC_CONFIG_FILES(RPM/Makefile RPM/quakeforge.conf RPM/quakeforge.spec) +AC_CONFIG_FILES(RPM/quakeforge.conf RPM/quakeforge.spec) AC_CONFIG_FILES(RPM/build_rpm, [chmod +x RPM/build_rpm]) diff --git a/configure.ac b/configure.ac index ea203472c..591470b23 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.61) dnl This is the only place where the package name and version appear AC_INIT([QuakeForge], m4_esyscmd([config.d/git-version-gen --prefix '' .tarball-version])) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) dnl LT_INIT messes with CFLAGS (evil bastard) if test "x${CFLAGS-unset}" = xunset; then diff --git a/debian/Makefile.am b/debian/Makefile.am deleted file mode 100644 index ec13849c4..000000000 --- a/debian/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign - -# find -type f | sed -e 's:^\./::g' | grep -v Makefile | sort >> Makefile.am - -EXTRA_DIST= \ - changelog control copyright quakeforge.conf rules source/format \ - qfcc.install \ - quakeforge-alsa.install quakeforge-alsa.postinst quakeforge-alsa.prerm \ - quakeforge-common.install quakeforge-common.postinst \ - quakeforge-dev.install \ - quakeforge-gl.install \ - quakeforge-glsl.install \ - quakeforge-jack.install \ - quakeforge-maptools.install \ - quakeforge-oss.install quakeforge-oss.postinst quakeforge-oss.prerm \ - quakeforge-sdl.install \ - quakeforge-servers.install \ - quakeforge-stub.postinst \ - quakeforge-sw32.install \ - quakeforge-sw.install \ - quakeforge-utils.install \ - quakeforge-x11.install diff --git a/debian/Makemodule.am b/debian/Makemodule.am new file mode 100644 index 000000000..9ef80d06a --- /dev/null +++ b/debian/Makemodule.am @@ -0,0 +1,28 @@ +EXTRA_DIST += \ + debian/changelog \ + debian/control \ + debian/copyright \ + debian/quakeforge.conf \ + debian/rules \ + debian/source/format \ + debian/qfcc.install \ + debian/quakeforge-alsa.install \ + debian/quakeforge-alsa.postinst \ + debian/quakeforge-alsa.prerm \ + debian/quakeforge-common.install \ + debian/quakeforge-common.postinst \ + debian/quakeforge-dev.install \ + debian/quakeforge-gl.install \ + debian/quakeforge-glsl.install \ + debian/quakeforge-jack.install \ + debian/quakeforge-maptools.install \ + debian/quakeforge-oss.install \ + debian/quakeforge-oss.postinst \ + debian/quakeforge-oss.prerm \ + debian/quakeforge-sdl.install \ + debian/quakeforge-servers.install \ + debian/quakeforge-stub.postinst \ + debian/quakeforge-sw32.install \ + debian/quakeforge-sw.install \ + debian/quakeforge-utils.install \ + debian/quakeforge-x11.install diff --git a/desktop/Makefile.am b/desktop/Makefile.am deleted file mode 100644 index 5aa61578b..000000000 --- a/desktop/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -## Process this file with automake to produce Makefile.in -# -# Makefile.am -# -# Automake-using build system for QuakeForge -# -# Copyright (C) 2000 Jeff Teunissen -# -# This Makefile is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to: -# -# Free Software Foundation, Inc. -# 59 Temple Place - Suite 330 -# Boston, MA 02111-1307, USA -# -# $Id$ -# - -AUTOMAKE_OPTIONS= foreign - -# Stuff that is common to both client and server -# Desktop files -if HAVE_XDG -desktopdir=$(datarootdir)/applications -desktop_DATA= @NQ_DESKTOP_DATA@ @QW_DESKTOP_DATA@ -endif - -# Stuff that doesn't get linked into an executable NEEDS to be mentioned here, -# or it won't be distributed with 'make dist' - -EXTRA_DIST= quakeforge-nq-glx.desktop quakeforge-nq-sdl.desktop \ - quakeforge-nq-sdl32.desktop quakeforge-nq-sgl.desktop \ - quakeforge-nq-x11.desktop quakeforge-qw-glx.desktop \ - quakeforge-qw-sdl.desktop quakeforge-qw-sdl32.desktop \ - quakeforge-qw-sgl.desktop quakeforge-qw-x11.desktop - -# Kill the temp files, hopefully. -CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES) diff --git a/desktop/Makemodule.am b/desktop/Makemodule.am new file mode 100644 index 000000000..bb0acd969 --- /dev/null +++ b/desktop/Makemodule.am @@ -0,0 +1,10 @@ +if HAVE_XDG +desktopdir=$(datarootdir)/applications +desktop_DATA = @NQ_DESKTOP_DATA@ @QW_DESKTOP_DATA@ +endif + +EXTRA_DIST += \ + desktop/quakeforge-nq-sdl.desktop \ + desktop/quakeforge-nq-x11.desktop \ + desktop/quakeforge-qw-sdl.desktop \ + desktop/quakeforge-qw-x11.desktop diff --git a/desktop/quakeforge-nq-glx.desktop b/desktop/quakeforge-nq-glx.desktop deleted file mode 100644 index 67c4ca509..000000000 --- a/desktop/quakeforge-nq-glx.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Version=1.0 - -Type=Application - -Name=QuakeForge (GLX) -GenericName=Quake (GLX) -Comment=A first person shooter game -Comment[fr]=Un jeu de tir subjectif -Comment[it]=Sparatutto in prima persona -Icon=quake - -Categories=Game;ActionGame; - -Exec=nq-glx -TryExec=nq-glx -Terminal=false -StartupNotify=false diff --git a/desktop/quakeforge-nq-sdl32.desktop b/desktop/quakeforge-nq-sdl32.desktop deleted file mode 100644 index f39050155..000000000 --- a/desktop/quakeforge-nq-sdl32.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Version=1.0 - -Type=Application - -Name=QuakeForge (SDL32) -GenericName=Quake (SDL32) -Comment=A first person shooter game -Comment[fr]=Un jeu de tir subjectif -Comment[it]=Sparatutto in prima persona -Icon=quake - -Categories=SDL;Game;ActionGame; - -Exec=nq-sdl32 -TryExec=nq-sdl32 -Terminal=false -StartupNotify=false diff --git a/desktop/quakeforge-nq-sgl.desktop b/desktop/quakeforge-nq-sgl.desktop deleted file mode 100644 index 82645eeb6..000000000 --- a/desktop/quakeforge-nq-sgl.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Version=1.0 - -Type=Application - -Name=QuakeForge (SDL GL) -GenericName=Quake (SDL GL) -Comment=A first person shooter game -Comment[fr]=Un jeu de tir subjectif -Comment[it]=Sparatutto in prima persona -Icon=quake - -Categories=SDL;Game;ActionGame; - -Exec=nq-sgl -TryExec=nq-sgl -Terminal=false -StartupNotify=false diff --git a/desktop/quakeforge-qw-glx.desktop b/desktop/quakeforge-qw-glx.desktop deleted file mode 100644 index fab7cab4e..000000000 --- a/desktop/quakeforge-qw-glx.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Version=1.0 - -Type=Application - -Name=QuakeForge QuakeWorld (GLX) -GenericName=QuakeWorld (GLX) -Comment=A first person shooter game -Comment[fr]=Un jeu de tir subjectif -Comment[it]=Sparatutto in prima persona -Icon=quake - -Categories=Game;ActionGame; - -Exec=qw-client-glx -TryExec=qw-client-glx -Terminal=false -StartupNotify=false diff --git a/desktop/quakeforge-qw-sdl32.desktop b/desktop/quakeforge-qw-sdl32.desktop deleted file mode 100644 index d2862ecb6..000000000 --- a/desktop/quakeforge-qw-sdl32.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Version=1.0 - -Type=Application - -Name=QuakeForge QuakeWorld (SDL32) -GenericName=QuakeWorld (SDL32) -Comment=A first person shooter game -Comment[fr]=Un jeu de tir subjectif -Comment[it]=Sparatutto in prima persona -Icon=quake - -Categories=SDL;Game;ActionGame; - -Exec=qw-client-sdl32 -TryExec=qw-client-sdl32 -Terminal=false -StartupNotify=false diff --git a/desktop/quakeforge-qw-sgl.desktop b/desktop/quakeforge-qw-sgl.desktop deleted file mode 100644 index 36ae08f24..000000000 --- a/desktop/quakeforge-qw-sgl.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Version=1.0 - -Type=Application - -Name=QuakeForge QuakeWorld (SDL GL) -GenericName=QuakeWorld (SDL GL) -Comment=A first person shooter game -Comment[fr]=Un jeu de tir subjectif -Comment[it]=Sparatutto in prima persona -Icon=quake - -Categories=SDL;Game;ActionGame; - -Exec=qw-client-sgl -TryExec=qw-client-sgl -Terminal=false -StartupNotify=false diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 8511d72f3..000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= man - -DOX= \ - bind.dox config.dox connect.dox cshifts.dox dirconf.dox faq.dox \ - filesystem.dox mapformat.dox property-list.dox qtv.dox quakeforge.dox \ - qw-cap-spec.dox qw-download-spec.dox sound.dox specifications.dox \ - surround-sound.dox timestamps.dox - -GIB= \ - gib/GIB.lyx gib/break.gib gib/continue.gib gib/curly.gib gib/examples.sh \ - gib/for.gib gib/gib_head.eps gib/if-chain.gib gib/if-else.gib \ - gib/if-simple.gib gib/while.gib - -PROGS= \ - progs/vm-exec.c progs/vm-mem.fig - -EXTRA_DIST= qf.ico \ - \ - skybox.fig template.c template.h \ - quakeforge.dox.conf.in \ - \ - ${DOX} ${GIB} ${PROGS} \ - \ - config/glspeed-v1.cfg config/glspeed-v3.cfg config/swspeed.cfg \ - \ - config/gib/adjustvolume.gib config/gib/infobot.gib config/gib/ln.gib \ - config/gib/qfadmin.gib config/gib/sshot.gib config/gib/zoom.gib \ - \ - qtv/qwtv.fig - -SUFFIXES=.eps .fig .png -.fig.png: - @mkdir -p `dirname $@` - fig2dev -L png $< $@ - -.fig.eps: - @mkdir -p `dirname $@` - fig2dev -L ps $< $@ - -.fig.svg: - @mkdir -p `dirname $@` - fig2dev -L svg $< $@ - -clean-local: - -rm -fr doxygen - -progs/vm-mem.svg: progs/vm-mem.fig -progs/vm-mem.eps: progs/vm-mem.fig -qtv/qwtv.svg: qtv/qwtv.fig -qtv/qwtv.eps: qtv/qwtv.fig - -doc: quakeforge.dox.conf progs/vm-mem.svg progs/vm-mem.eps qtv/qwtv.svg qtv/qwtv.eps ${DOX} - doxygen quakeforge.dox.conf diff --git a/doc/Makemodule.am b/doc/Makemodule.am new file mode 100644 index 000000000..b26d57841 --- /dev/null +++ b/doc/Makemodule.am @@ -0,0 +1,80 @@ +man_MANS += doc/man/quakeforge.1 + +DOX= \ + doc/bind.dox \ + doc/config.dox \ + doc/connect.dox \ + doc/cshifts.dox \ + doc/dirconf.dox \ + doc/faq.dox \ + doc/filesystem.dox \ + doc/mapformat.dox \ + doc/property-list.dox \ + doc/qtv.dox \ + doc/quakeforge.dox \ + doc/qw-cap-spec.dox \ + doc/qw-download-spec.dox \ + doc/sound.dox \ + doc/specifications.dox \ + doc/surround-sound.dox \ + doc/timestamps.dox + +GIB= \ + doc/gib/GIB.lyx \ + doc/gib/break.gib \ + doc/gib/continue.gib \ + doc/gib/curly.gib \ + doc/gib/examples.sh \ + doc/gib/for.gib \ + doc/gib/gib_head.eps \ + doc/gib/if-chain.gib \ + doc/gib/if-else.gib \ + doc/gib/if-simple.gib \ + doc/gib/while.gib + +PROGS= \ + doc/progs/vm-exec.c \ + doc/progs/vm-mem.fig + +EXTRA_DIST += \ + ${DOX} ${GIB} ${PROGS} \ + doc/qf.ico \ + doc/skybox.fig \ + doc/template.c \ + doc/template.h \ + doc/quakeforge.dox.conf.in \ + doc/config/glspeed-v1.cfg \ + doc/config/glspeed-v3.cfg \ + doc/config/swspeed.cfg \ + doc/config/gib/adjustvolume.gib \ + doc/config/gib/infobot.gib \ + doc/config/gib/ln.gib \ + doc/config/gib/qfadmin.gib \ + doc/config/gib/sshot.gib \ + doc/config/gib/zoom.gib \ + doc/man/quakeforge.1 \ + doc/qtv/qwtv.fig + +SUFFIXES += .eps .fig .png +.fig.png: + @mkdir -p `dirname $@` + fig2dev -L png $< $@ + +.fig.eps: + @mkdir -p `dirname $@` + fig2dev -L ps $< $@ + +.fig.svg: + @mkdir -p `dirname $@` + fig2dev -L svg $< $@ + +clean-local: + -rm -fr doxygen + +doc/progs/vm-mem.svg: doc/progs/vm-mem.fig +doc/progs/vm-mem.eps: doc/progs/vm-mem.fig +doc/qtv/qwtv.svg: doc/qtv/qwtv.fig +doc/qtv/qwtv.eps: doc/qtv/qwtv.fig + +doc: doc/quakeforge.dox.conf doc/progs/vm-mem.svg doc/progs/vm-mem.eps doc/qtv/qwtv.svg qtv/qwtv.eps ${DOX} + doxygen doc/quakeforge.dox.conf diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am deleted file mode 100644 index 5249e3a26..000000000 --- a/doc/man/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign - -EXTRA_DIST= quakeforge.1 diff --git a/hw/Makefile.am b/hw/Makefile.am deleted file mode 100644 index 77e3cbf5b..000000000 --- a/hw/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= include source diff --git a/hw/Makemodule.am b/hw/Makemodule.am new file mode 100644 index 000000000..cfd2f1e31 --- /dev/null +++ b/hw/Makemodule.am @@ -0,0 +1 @@ +include hw/source/Makemodule.am diff --git a/hw/include/Makefile.am b/hw/include/Makefile.am deleted file mode 100644 index b36df17ad..000000000 --- a/hw/include/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign - -EXTRA_DIST = diff --git a/hw/source/Makefile.am b/hw/source/Makemodule.am similarity index 69% rename from hw/source/Makefile.am rename to hw/source/Makemodule.am index d5ad0658e..9f86d3283 100644 --- a/hw/source/Makefile.am +++ b/hw/source/Makemodule.am @@ -27,27 +27,17 @@ # $Id$ # -AUTOMAKE_OPTIONS= foreign +bin_PROGRAMS += @HW_TARGETS@ -# Stuff that is common to both client and server -AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/hw/include -SDL_LIBS = @SDL_LIBS@ +EXTRA_PROGRAMS += hw-master -bin_PROGRAMS= @HW_TARGETS@ - -EXTRA_PROGRAMS= hw-master - -common_ldflags= -export-dynamic hw_master_libs= \ - $(top_builddir)/libs/net/libnet_chan.la \ + libs/net/libnet_chan.la \ @server_static_plugin_libs@ \ - $(top_builddir)/libs/console/libQFconsole.la \ - $(top_builddir)/libs/util/libQFutil.la + libs/console/libQFconsole.la \ + libs/util/libQFutil.la hw_master_LDFLAGS= $(common_ldflags) hw_master_LDADD= $(hw_master_libs) $(NET_LIBS) hw_master_DEPENDENCIES= $(hw_master_libs) -hw_master_SOURCES= master.c - -# Kill the temp files, hopefully. -CLEANFILES = *.i *.s +hw_master_SOURCES= hw/source/master.c diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 56b084ae1..000000000 --- a/include/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign -SUBDIRS = QF -EXTRA_DIST = \ - adivtab.h alsa_funcs_list.h anorm_dots.h anorms.h asm_draw.h asm_i386.h \ - block16.h block8.h buildnum.h clview.h compat.h context_sdl.h \ - context_x11.h d_iface.h d_ifacea.h d_local.h dga_check.h exp.h fbset.h \ - garbage.h getopt.h gib_buffer.h gib_builtin.h gib_classes.h \ - gib_execute.h gib_function.h gib_handle.h gib_object.h gib_parse.h \ - gib_process.h gib_regex.h gib_semantics.h gib_thread.h gib_tree.h \ - gib_vars.h gl_warp_sin.h in_win.h logos.h mod_internal.h net_dgrm.h \ - net_loop.h net_udp.h net_vcr.h net_wins.h netchan.h netmain.h \ - noisetextures.h old_keys.h ops.h pstdint.h qfalloca.h qstring.h \ - quakeasm.h r_cvar.h r_dynamic.h r_internal.h r_local.h r_screen.h \ - r_shared.h regex.h rua_internal.h sbar.h skin_stencil.h snd_internal.h \ - sv_console.h varrays.h vgamodes.h vid_internal.h vregset.h winquake.h \ - world.h \ - \ - client/entities.h \ - \ - qw/bothdefs.h qw/msg_backbuf.h qw/msg_ucmd.h qw/pmove.h qw/protocol.h \ - \ - win32/dirent.h win32/fnmatch.h win32/stdint.h \ - \ - win32/resources/icon1Vista.ico win32/resources/icon1XP.ico \ - win32/resources/quakeforge.rc win32/resources/resource.h diff --git a/include/Makemodule.am b/include/Makemodule.am new file mode 100644 index 000000000..ac6108f67 --- /dev/null +++ b/include/Makemodule.am @@ -0,0 +1,88 @@ +## Process this file with automake to produce Makefile.in +include include/QF/Makemodule.am + +EXTRA_DIST += \ + include/adivtab.h \ + include/alsa_funcs_list.h \ + include/anorm_dots.h \ + include/anorms.h \ + include/asm_draw.h \ + include/asm_i386.h \ + include/block16.h \ + include/block8.h \ + include/buildnum.h \ + include/clview.h \ + include/compat.h \ + include/context_sdl.h \ + include/context_x11.h \ + include/d_iface.h \ + include/d_ifacea.h \ + include/d_local.h \ + include/dga_check.h \ + include/exp.h \ + include/fbset.h \ + include/garbage.h \ + include/getopt.h \ + include/gib_buffer.h \ + include/gib_builtin.h \ + include/gib_classes.h \ + include/gib_execute.h \ + include/gib_function.h \ + include/gib_handle.h \ + include/gib_object.h \ + include/gib_parse.h \ + include/gib_process.h \ + include/gib_regex.h \ + include/gib_semantics.h \ + include/gib_thread.h \ + include/gib_tree.h \ + include/gib_vars.h \ + include/gl_warp_sin.h \ + include/in_win.h \ + include/logos.h \ + include/mod_internal.h \ + include/net_dgrm.h \ + include/net_loop.h \ + include/net_udp.h \ + include/net_vcr.h \ + include/net_wins.h \ + include/netchan.h \ + include/netmain.h \ + include/noisetextures.h \ + include/old_keys.h \ + include/ops.h \ + include/pstdint.h \ + include/qfalloca.h \ + include/qstring.h \ + include/quakeasm.h \ + include/r_cvar.h \ + include/r_dynamic.h \ + include/r_internal.h \ + include/r_local.h \ + include/r_screen.h \ + include/r_shared.h \ + include/regex.h \ + include/rua_internal.h \ + include/sbar.h \ + include/skin_stencil.h \ + include/snd_internal.h \ + include/sv_console.h \ + include/varrays.h \ + include/vgamodes.h \ + include/vid_internal.h \ + include/vregset.h \ + include/winquake.h \ + include/world.h \ + include/client/entities.h \ + include/qw/bothdefs.h \ + include/qw/msg_backbuf.h \ + include/qw/msg_ucmd.h \ + include/qw/pmove.h \ + include/qw/protocol.h \ + include/win32/dirent.h \ + include/win32/fnmatch.h \ + include/win32/stdint.h \ + include/win32/resources/icon1Vista.ico \ + include/win32/resources/icon1XP.ico \ + include/win32/resources/quakeforge.rc \ + include/win32/resources/resource.h diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am deleted file mode 100644 index bb6b0d2da..000000000 --- a/include/QF/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -AUTOMAKE_OPTIONS = foreign -pkgincludedir = $(includedir)/QF -#for header files that qfcc (ruamoko) will use -pkgdatadir = $(datarootdir)/qfcc/include/QF - -include_qf= \ - alloc.h bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \ - console.h crc.h csqc.h cvar.h darray.h dstring.h draw.h gib.h hash.h \ - idparse.h image.h in_event.h info.h input.h iqm.h joystick.h keys.h \ - link.h llist.h locs.h mathlib.h mdfour.h mersenne.h model.h modelgen.h \ - msg.h object.h pak.h pakfile.h pcx.h png.h plugin.h pr_comp.h pr_debug.h \ - pr_obj.h pr_type.h progs.h qargs.h qdefs.h qendian.h qfplist.h qtypes.h \ - quakefs.h \ - quakeio.h render.h riff.h ringbuffer.h ruamoko.h \ - screen.h script.h segtext.h set.h \ - sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h tga.h va.h \ - ver_check.h vid.h vrect.h view.h wad.h wadfile.h winding.h zone.h \ - \ - GL/ati.h GL/defines.h GL/extensions.h GL/funcs.h GL/qf_draw.h \ - GL/qf_explosions.h GL/qf_funcs_list.h GL/qf_iqm.h GL/qf_lightmap.h \ - GL/qf_rlight.h GL/qf_rmain.h GL/qf_rsurf.h GL/qf_sky.h GL/qf_textures.h \ - GL/qf_vid.h GL/types.h \ - \ - GLSL/defines.h GLSL/funcs.h GLSL/qf_alias.h GLSL/qf_bsp.h GLSL/qf_draw.h \ - GLSL/qf_funcs_list.h GLSL/qf_iqm.h GLSL/qf_lightmap.h GLSL/qf_particles.h \ - GLSL/qf_textures.h GLSL/qf_vid.h GLSL/types.h \ - \ - math/dual.h math/half.h math/matrix3.h math/matrix4.h math/quaternion.h \ - math/vector.h \ - \ - plugin/cd.h plugin/console.h plugin/general.h plugin/input.h \ - plugin/snd_output.h plugin/snd_render.h plugin/vid_render.h - -qfcc_include_qf=keys.h -nobase_pkginclude_HEADERS = @include_qf@ -pkgdata_DATA=@qfcc_include_qf@ - -EXTRA_HEADERS = $(include_qf) $(qfcc_include_qf) diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am new file mode 100644 index 000000000..5ef2c4423 --- /dev/null +++ b/include/QF/Makemodule.am @@ -0,0 +1,151 @@ +include_qf = \ + include/QF/alloc.h \ + include/QF/bspfile.h \ + include/QF/cbuf.h \ + include/QF/cdaudio.h \ + include/QF/checksum.h \ + include/QF/clip_hull.h \ + include/QF/cmd.h \ + include/QF/console.h \ + include/QF/crc.h \ + include/QF/csqc.h \ + include/QF/cvar.h \ + include/QF/darray.h \ + include/QF/dstring.h \ + include/QF/draw.h \ + include/QF/gib.h \ + include/QF/hash.h \ + include/QF/idparse.h \ + include/QF/image.h \ + include/QF/in_event.h \ + include/QF/info.h \ + include/QF/input.h \ + include/QF/iqm.h \ + include/QF/joystick.h \ + include/QF/keys.h \ + include/QF/link.h \ + include/QF/llist.h \ + include/QF/locs.h \ + include/QF/mathlib.h \ + include/QF/mdfour.h \ + include/QF/mersenne.h \ + include/QF/model.h \ + include/QF/modelgen.h \ + include/QF/msg.h \ + include/QF/object.h \ + include/QF/pak.h \ + include/QF/pakfile.h \ + include/QF/pcx.h \ + include/QF/png.h \ + include/QF/plugin.h \ + include/QF/pr_comp.h \ + include/QF/pr_debug.h \ + include/QF/pr_obj.h \ + include/QF/pr_type.h \ + include/QF/progs.h \ + include/QF/qargs.h \ + include/QF/qdefs.h \ + include/QF/qendian.h \ + include/QF/qfplist.h \ + include/QF/qtypes.h \ + include/QF/quakefs.h \ + include/QF/quakeio.h \ + include/QF/render.h \ + include/QF/riff.h \ + include/QF/ringbuffer.h \ + include/QF/ruamoko.h \ + include/QF/screen.h \ + include/QF/script.h \ + include/QF/segtext.h \ + include/QF/set.h \ + include/QF/sizebuf.h \ + include/QF/skin.h \ + include/QF/sound.h \ + include/QF/spritegn.h \ + include/QF/sys.h \ + include/QF/teamplay.h \ + include/QF/tga.h \ + include/QF/txtbuffer.h \ + include/QF/va.h \ + include/QF/ver_check.h \ + include/QF/vid.h \ + include/QF/vrect.h \ + include/QF/view.h \ + include/QF/wad.h \ + include/QF/wadfile.h \ + include/QF/winding.h \ + include/QF/zone.h + +include_qf_gl = \ + include/QF/GL/ati.h \ + include/QF/GL/defines.h \ + include/QF/GL/extensions.h \ + include/QF/GL/funcs.h \ + include/QF/GL/qf_draw.h \ + include/QF/GL/qf_explosions.h \ + include/QF/GL/qf_funcs_list.h \ + include/QF/GL/qf_iqm.h \ + include/QF/GL/qf_lightmap.h \ + include/QF/GL/qf_rlight.h \ + include/QF/GL/qf_rmain.h \ + include/QF/GL/qf_rsurf.h \ + include/QF/GL/qf_sky.h \ + include/QF/GL/qf_textures.h \ + include/QF/GL/qf_vid.h \ + include/QF/GL/types.h + +include_qf_glsl = \ + include/QF/GLSL/defines.h \ + include/QF/GLSL/funcs.h \ + include/QF/GLSL/qf_alias.h \ + include/QF/GLSL/qf_bsp.h \ + include/QF/GLSL/qf_draw.h \ + include/QF/GLSL/qf_funcs_list.h \ + include/QF/GLSL/qf_iqm.h \ + include/QF/GLSL/qf_lightmap.h \ + include/QF/GLSL/qf_particles.h \ + include/QF/GLSL/qf_textures.h \ + include/QF/GLSL/qf_vid.h \ + include/QF/GLSL/types.h + +include_qf_math = \ + include/QF/math/dual.h \ + include/QF/math/half.h \ + include/QF/math/matrix3.h \ + include/QF/math/matrix4.h \ + include/QF/math/quaternion.h \ + include/QF/math/vector.h + +include_qf_plugin = \ + include/QF/plugin/cd.h \ + include/QF/plugin/console.h \ + include/QF/plugin/general.h \ + include/QF/plugin/input.h \ + include/QF/plugin/snd_output.h \ + include/QF/plugin/snd_render.h \ + include/QF/plugin/vid_render.h + +# headers shared with ruamoko +qfcc_include_qf = include/QF/keys.h + +qf_includedir = $(includedir)/QF +qf_gl_includedir = $(includedir)/QF/GL +qf_glsl_includedir = $(includedir)/QF/GLSL +qf_math_includedir = $(includedir)/QF/math +qf_plugin_includedir = $(includedir)/QF/plugin +qf_include_HEADERS = @qfac_include_qf@ +qf_gl_include_HEADERS = @qfac_include_qf_gl@ +qf_glsl_include_HEADERS = @qfac_include_qf_glsl@ +qf_math_include_HEADERS = @qfac_include_qf_math@ +qf_plugin_include_HEADERS = @qfac_include_qf_plugin@ + +ruamoko_qf_includedir = $(ruamoko_includedir)/QF +ruamoko_qf_include_HEADERS = @qfac_qfcc_include_qf@ + +EXTRA_HEADERS += \ + $(include_qf) \ + $(include_qf_gl) \ + $(include_qf_glsl) \ + $(include_qf_math) \ + $(include_qf_plugin) \ + $(qfcc_include_qf) diff --git a/libs/Makefile.am b/libs/Makefile.am deleted file mode 100644 index 5c14c7d00..000000000 --- a/libs/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -# everything depends on util -# ruamoko depends on gamecode -# gib depends on ruamoko -# audio depends on gamecode -# models depends on image -# video depends on models(?), image(?) and ruamoko -# console depends on video, ruamoko and audio -SUBDIRS=@libs_dirs@ -DIST_SUBDIRS=util gamecode ruamoko gib audio image models video console \ - net qw client diff --git a/libs/Makemodule.am b/libs/Makemodule.am new file mode 100644 index 000000000..5a68c67ba --- /dev/null +++ b/libs/Makemodule.am @@ -0,0 +1,13 @@ +include libs/util/Makemodule.am +include libs/gamecode/Makemodule.am +include libs/ruamoko/Makemodule.am +include libs/gib/Makemodule.am +include libs/audio/Makemodule.am +include libs/image/Makemodule.am +include libs/models/Makemodule.am +include libs/video/Makemodule.am +include libs/console/Makemodule.am + +include libs/net/Makemodule.am +include libs/client/Makemodule.am +include libs/qw/Makemodule.am diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am deleted file mode 100644 index 5521b3e2f..000000000 --- a/libs/audio/Makefile.am +++ /dev/null @@ -1,77 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= targets renderer . test -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include -SDL_LIBS= @SDL_LIBS@ -XMMS_LIBS= @XMMS_LIBS@ -plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir) -plugin_libadd= @plugin_libadd@ -lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ - -rpath $(libdir) -no-undefined -EXEEXT= - -plugin_LTLIBRARIES= @cd_plugins@ -noinst_LTLIBRARIES= @cd_static_plugins@ -lib_LTLIBRARIES= @CD_TARGETS@ @SND_TARGETS@ -EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la \ - cd_file.la cd_linux.la cd_sdl.la cd_sgi.la cd_win.la \ - cd_xmms.la - -cd_plug_libs=$(top_builddir)/libs/util/libQFutil.la - -cd_file_libs= \ - libQFsound.la \ - $(cd_plug_libs) - -cd_file_la_LDFLAGS= $(plugin_ldflags) -cd_file_la_LIBADD= $(cd_file_libs) -cd_file_la_DEPENDENCIES= $(cd_file_libs) -cd_file_la_SOURCES= cd_file.c - -cd_linux_la_LDFLAGS= $(plugin_ldflags) -cd_linux_la_LIBADD= $(cd_plug_libs) -cd_linux_la_DEPENDENCIES= $(cd_plug_libs) -cd_linux_la_SOURCES= cd_linux.c - -cd_sdl_la_LDFLAGS= $(plugin_ldflags) -cd_sdl_la_LIBADD= $(cd_plug_libs) $(SDL_LIBS) $(plugin_libadd) -cd_sdl_la_DEPENDENCIES= $(cd_plug_libs) -cd_sdl_la_CFLAGS= $(SDL_CFLAGS) -cd_sdl_la_SOURCES= cd_sdl.c - -cd_sgi_la_LDFLAGS= $(plugin_ldflags) -cd_sgi_la_LIBADD= $(cd_plug_libs) $(SGI_CD_LIBS) -cd_sgi_la_DEPENDENCIES= $(cd_plug_libs) -cd_sgi_la_SOURCES= cd_sgi.c - -cd_win_la_LDFLAGS= $(plugin_ldflags) -cd_win_la_LIBADD= $(cd_plug_libs) $(plugin_libadd) -cd_win_la_DEPENDENCIES= $(cd_plug_libs) -cd_win_la_SOURCES= cd_win.c - -cd_xmms_la_LDFLAGS= $(plugin_ldflags) -cd_xmms_la_LIBADD= $(cd_plug_libs) $(XMMS_LIBS) -cd_xmms_la_DEPENDENCIES= $(cd_plug_libs) -cd_xmms_la_CFLAGS= $(XMMS_CFLAGS) -cd_xmms_la_SOURCES= cd_xmms.c - -sound_libs= \ - @snd_output_static_plugin_libs@ \ - @snd_render_static_plugin_libs@ \ - $(top_builddir)/libs/ruamoko/libQFruamoko.la \ - $(top_builddir)/libs/util/libQFutil.la - -cd_libs= \ - @cd_static_plugin_libs@ \ - $(top_builddir)/libs/util/libQFutil.la - -libQFsound_la_LDFLAGS= $(lib_ldflags) -libQFsound_la_LIBADD= $(sound_libs) -libQFsound_la_DEPENDENCIES= $(sound_libs) -libQFsound_la_SOURCES= snd.c snd_progs.c - -libQFcd_la_LDFLAGS= $(lib_ldflags) -libQFcd_la_LIBADD= $(cd_libs) -libQFcd_la_DEPENDENCIES= $(cd_libs) -libQFcd_la_SOURCES= cd.c diff --git a/libs/audio/Makemodule.am b/libs/audio/Makemodule.am new file mode 100644 index 000000000..c649c7351 --- /dev/null +++ b/libs/audio/Makemodule.am @@ -0,0 +1,67 @@ +include libs/audio/targets/Makemodule.am +include libs/audio/renderer/Makemodule.am + +plugin_LTLIBRARIES += @cd_plugins@ +noinst_LTLIBRARIES += @cd_static_plugins@ +lib_LTLIBRARIES += @CD_TARGETS@ @SND_TARGETS@ +EXTRA_LTLIBRARIES += \ + libs/audio/libQFsound.la \ + libs/audio/libQFcd.la \ + libs/audio/cd_file.la \ + libs/audio/cd_linux.la \ + libs/audio/cd_sdl.la \ + libs/audio/cd_sgi.la \ + libs/audio/cd_win.la \ + libs/audio/cd_xmms.la + +cd_plug_libs=libs/util/libQFutil.la + +cd_file_libs= \ + libs/audio/libQFsound.la \ + $(cd_plug_libs) + +libs_audio_cd_file_la_LDFLAGS= $(plugin_ldflags) +libs_audio_cd_file_la_LIBADD= $(cd_file_libs) +libs_audio_cd_file_la_SOURCES= libs/audio/cd_file.c + +libs_audio_cd_linux_la_LDFLAGS= $(plugin_ldflags) +libs_audio_cd_linux_la_LIBADD= $(cd_plug_libs) +libs_audio_cd_linux_la_SOURCES= libs/audio/cd_linux.c + +libs_audio_cd_sdl_la_LDFLAGS= $(plugin_ldflags) +libs_audio_cd_sdl_la_LIBADD= $(cd_plug_libs) $(SDL_LIBS) $(plugin_libadd) +libs_audio_cd_sdl_la_CFLAGS= $(SDL_CFLAGS) +libs_audio_cd_sdl_la_SOURCES= libs/audio/cd_sdl.c + +libs_audio_cd_sgi_la_LDFLAGS= $(plugin_ldflags) +libs_audio_cd_sgi_la_LIBADD= $(cd_plug_libs) $(SGI_CD_LIBS) +libs_audio_cd_sgi_la_SOURCES= libs/audio/cd_sgi.c + +libs_audio_cd_win_la_LDFLAGS= $(plugin_ldflags) +libs_audio_cd_win_la_LIBADD= $(cd_plug_libs) $(plugin_libadd) +libs_audio_cd_win_la_SOURCES= libs/audio/cd_win.c + +libs_audio_cd_xmms_la_LDFLAGS= $(plugin_ldflags) +libs_audio_cd_xmms_la_LIBADD= $(cd_plug_libs) $(XMMS_LIBS) +libs_audio_cd_xmms_la_CFLAGS= $(XMMS_CFLAGS) +libs_audio_cd_xmms_la_SOURCES= libs/audio/cd_xmms.c + +sound_libs= \ + @snd_output_static_plugin_libs@ \ + @snd_render_static_plugin_libs@ \ + libs/ruamoko/libQFruamoko.la \ + libs/util/libQFutil.la + +cd_libs= \ + @cd_static_plugin_libs@ \ + libs/util/libQFutil.la + +libs_audio_libQFsound_la_LDFLAGS= $(lib_ldflags) +libs_audio_libQFsound_la_DEPENDENCIES= $(sound_libs) +libs_audio_libQFsound_la_LIBADD= $(sound_libs) +libs_audio_libQFsound_la_SOURCES= libs/audio/snd.c libs/audio/snd_progs.c + +libs_audio_libQFcd_la_LDFLAGS= $(lib_ldflags) +libs_audio_libQFcd_la_DEPENDENCIES= $(cd_libs) +libs_audio_libQFcd_la_LIBADD= $(cd_libs) +libs_audio_libQFcd_la_SOURCES= libs/audio/cd.c diff --git a/libs/audio/renderer/Makefile.am b/libs/audio/renderer/Makefile.am deleted file mode 100644 index 0c3bcd719..000000000 --- a/libs/audio/renderer/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ \ - $(VORBIS_CFLAGS) $(OGG_CFLAGS) $(SAMPLERATE_CFLAGS) $(JACK_CFLAGS) -AM_CPPFLAGS= -I$(top_srcdir)/include -plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir) -plugin_libadd= @plugin_libadd@ -EXEEXT= - -plugin_LTLIBRARIES= @snd_render_plugins@ -noinst_LTLIBRARIES= @snd_render_static_plugins@ -EXTRA_LTLIBRARIES= snd_render_default.la snd_render_jack.la - -flac_src=flac.c -midi_src=midi.c -vorbis_src=vorbis.c -wav_src=wav.c - -if HAVE_FLAC -have_flac_src=$(flac_src) -else -have_flac_src= -endif -if HAVE_MIDI -have_midi_src=$(midi_src) -else -have_midi_src= -endif -if HAVE_VORBIS -have_vorbis_src=$(vorbis_src) -else -have_vorbis_src= -endif -have_wav_src=$(wav_src) - -format_src=$(have_flac_src) $(have_midi_src) $(have_vorbis_src) $(have_wav_src) -format_libs= \ - $(SAMPLERATE_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(FLAC_LIBS) \ - $(OGG_LIBS) $(WM_LIBS) -extra_format_src=flac.c midi.c vorbis.c wav.c -snd_common=snd_channels.c snd_mem.c snd_mix.c snd_resample.c snd_sfx.c -snd_libs= \ - $(top_builddir)/libs/util/libQFutil.la - -snd_render_default_la_LDFLAGS= $(plugin_ldflags) -snd_render_default_la_SOURCES= snd_dma.c $(snd_common) $(format_src) -snd_render_default_la_LIBADD= $(snd_libs) $(format_libs) -snd_render_default_la_DEPENDENCIES= $(snd_libs) -EXTRA_snd_render_default_la_SOURCES=$(extra_format_src) - -snd_render_jack_la_LDFLAGS= $(plugin_ldflags) -snd_render_jack_la_SOURCES= snd_jack.c $(snd_common) $(format_src) -snd_render_jack_la_LIBADD= $(snd_libs) $(format_libs) $(JACK_LIBS) -snd_render_jack_la_DEPENDENCIES= $(snd_libs) -EXTRA_snd_render_jack_la_SOURCES= $(extra_format_src) diff --git a/libs/audio/renderer/Makemodule.am b/libs/audio/renderer/Makemodule.am new file mode 100644 index 000000000..0ef8bda4f --- /dev/null +++ b/libs/audio/renderer/Makemodule.am @@ -0,0 +1,46 @@ +plugin_LTLIBRARIES += @snd_render_plugins@ +noinst_LTLIBRARIES += @snd_render_static_plugins@ +EXTRA_LTLIBRARIES += libs/audio/renderer/snd_render_default.la libs/audio/renderer/snd_render_jack.la + +flac_src=libs/audio/renderer/flac.c +midi_src=libs/audio/renderer/midi.c +vorbis_src=libs/audio/renderer/vorbis.c +wav_src=libs/audio/renderer/wav.c + +if HAVE_FLAC +have_flac_src=$(flac_src) +else +have_flac_src= +endif +if HAVE_MIDI +have_midi_src=$(midi_src) +else +have_midi_src= +endif +if HAVE_VORBIS +have_vorbis_src=$(vorbis_src) +else +have_vorbis_src= +endif +have_wav_src=$(wav_src) + +format_src=$(have_flac_src) $(have_midi_src) $(have_vorbis_src) $(have_wav_src) +format_libs= \ + $(SAMPLERATE_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) $(FLAC_LIBS) \ + $(OGG_LIBS) $(WM_LIBS) +extra_format_src=libs/audio/renderer/flac.c libs/audio/renderer/midi.c libs/audio/renderer/vorbis.c libs/audio/renderer/wav.c +snd_common=libs/audio/renderer/snd_channels.c libs/audio/renderer/snd_mem.c libs/audio/renderer/snd_mix.c libs/audio/renderer/snd_resample.c libs/audio/renderer/snd_sfx.c +snd_libs= \ + libs/util/libQFutil.la + +libs_audio_renderer_snd_render_default_la_LDFLAGS= $(plugin_ldflags) +libs_audio_renderer_snd_render_default_la_SOURCES= libs/audio/renderer/snd_dma.c $(snd_common) $(format_src) +libs_audio_renderer_snd_render_default_la_LIBADD= $(snd_libs) $(format_libs) +libs_audio_renderer_snd_render_default_la_DEPENDENCIES= $(snd_libs) +EXTRA_libs_audio_renderer_snd_render_default_la_SOURCES=$(extra_format_src) + +libs_audio_renderer_snd_render_jack_la_LDFLAGS= $(plugin_ldflags) +libs_audio_renderer_snd_render_jack_la_SOURCES= libs/audio/renderer/snd_jack.c $(snd_common) $(format_src) +libs_audio_renderer_snd_render_jack_la_LIBADD= $(snd_libs) $(format_libs) $(JACK_LIBS) +libs_audio_renderer_snd_render_jack_la_DEPENDENCIES= $(snd_libs) +EXTRA_libs_audio_renderer_snd_render_jack_la_SOURCES= $(extra_format_src) diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am deleted file mode 100644 index ff0411354..000000000 --- a/libs/audio/targets/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include -SDL_LIBS = @SDL_LIBS@ -plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir) -plugin_libadd= @plugin_libadd@ -EXEEXT= -snd_deps=$(top_builddir)/libs/util/libQFutil.la - -plugin_LTLIBRARIES= @snd_output_plugins@ -noinst_LTLIBRARIES= @snd_output_static_plugins@ -EXTRA_LTLIBRARIES= \ - snd_output_sdl.la snd_output_alsa.la snd_output_oss.la snd_output_sgi.la \ - snd_output_sun.la snd_output_win.la snd_output_dx.la snd_output_disk.la - -snd_output_sdl_la_LDFLAGS= $(plugin_ldflags) -snd_output_sdl_la_LIBADD= $(snd_deps) $(SDL_LIBS) $(plugin_libadd) -snd_output_sdl_la_DEPENDENCIES= $(snd_deps) -snd_output_sdl_la_CFLAGS= $(SDL_CFLAGS) -snd_output_sdl_la_SOURCES= snd_sdl.c - -snd_output_alsa_la_LDFLAGS= $(plugin_ldflags) -snd_output_alsa_la_LIBADD= $(snd_deps) -snd_output_alsa_la_DEPENDENCIES=$(snd_deps) -snd_output_alsa_la_CFLAGS= $(ALSA_CFLAGS) -snd_output_alsa_la_SOURCES= snd_alsa.c - -snd_output_oss_la_LDFLAGS= $(plugin_ldflags) -snd_output_oss_la_LIBADD= $(snd_deps) $(OSS_LIBS) -snd_output_oss_la_DEPENDENCIES= $(snd_deps) -snd_output_oss_la_CFLAGS= $(OSS_CFLAGS) -snd_output_oss_la_SOURCES= snd_oss.c - -snd_output_sgi_la_LDFLAGS= $(plugin_ldflags) -snd_output_sgi_la_LIBADD= $(snd_deps) $(SGISND_LIBS) -snd_output_sgi_la_DEPENDENCIES= $(snd_deps) -snd_output_sgi_la_CFLAGS= $(SGISND_CFLAGS) -snd_output_sgi_la_SOURCES= snd_sgi.c - -snd_output_sun_la_LDFLAGS= $(plugin_ldflags) -snd_output_sun_la_DEPENDENCIES= $(snd_deps) -snd_output_sun_la_CFLAGS= $(SUNSND_CFLAGS) -snd_output_sun_la_SOURCES= snd_sun.c - -snd_output_win_la_LDFLAGS= $(plugin_ldflags) -snd_output_win_la_LIBADD= $(snd_deps) $(WINSND_LIBS) $(plugin_libadd) -snd_output_win_la_DEPENDENCIES= $(snd_deps) -snd_output_win_la_CFLAGS= $(WIN32SND_CFLAGS) -snd_output_win_la_SOURCES= snd_win.c - -snd_output_dx_la_LDFLAGS= $(plugin_ldflags) -snd_output_dx_la_LIBADD= $(snd_deps) $(WINSND_LIBS) $(plugin_libadd) -snd_output_dx_la_DEPENDENCIES= $(snd_deps) -snd_output_dx_la_CFLAGS= $(WIN32SND_CFLAGS) -snd_output_dx_la_SOURCES= snd_dx.c - -snd_output_disk_la_LDFLAGS= $(plugin_ldflags) -snd_output_disk_la_LIBADD= $(snd_deps) $(plugin_libadd) -snd_output_disk_la_DEPENDENCIES=$(snd_deps) -snd_output_disk_la_CFLAGS= -snd_output_disk_la_SOURCES= snd_disk.c diff --git a/libs/audio/targets/Makemodule.am b/libs/audio/targets/Makemodule.am new file mode 100644 index 000000000..dfc566f2a --- /dev/null +++ b/libs/audio/targets/Makemodule.am @@ -0,0 +1,54 @@ +plugin_LTLIBRARIES += @snd_output_plugins@ +noinst_LTLIBRARIES += @snd_output_static_plugins@ +EXTRA_LTLIBRARIES += \ + libs/audio/targets/snd_output_sdl.la libs/audio/targets/snd_output_alsa.la libs/audio/targets/snd_output_oss.la libs/audio/targets/snd_output_sgi.la \ + libs/audio/targets/snd_output_sun.la libs/audio/targets/snd_output_win.la libs/audio/targets/snd_output_dx.la libs/audio/targets/snd_output_disk.la + +snd_deps=libs/util/libQFutil.la + +libs_audio_targets_snd_output_sdl_la_LDFLAGS= $(plugin_ldflags) +libs_audio_targets_snd_output_sdl_la_LIBADD= $(snd_deps) $(SDL_LIBS) $(plugin_libadd) +libs_audio_targets_snd_output_sdl_la_DEPENDENCIES= $(snd_deps) +libs_audio_targets_snd_output_sdl_la_CFLAGS= $(SDL_CFLAGS) +libs_audio_targets_snd_output_sdl_la_SOURCES= libs/audio/targets/snd_sdl.c + +libs_audio_targets_snd_output_alsa_la_LDFLAGS= $(plugin_ldflags) +libs_audio_targets_snd_output_alsa_la_LIBADD= $(snd_deps) +libs_audio_targets_snd_output_alsa_la_DEPENDENCIES=$(snd_deps) +libs_audio_targets_snd_output_alsa_la_CFLAGS= $(ALSA_CFLAGS) +libs_audio_targets_snd_output_alsa_la_SOURCES= libs/audio/targets/snd_alsa.c + +libs_audio_targets_snd_output_oss_la_LDFLAGS= $(plugin_ldflags) +libs_audio_targets_snd_output_oss_la_LIBADD= $(snd_deps) $(OSS_LIBS) +libs_audio_targets_snd_output_oss_la_DEPENDENCIES= $(snd_deps) +libs_audio_targets_snd_output_oss_la_CFLAGS= $(OSS_CFLAGS) +libs_audio_targets_snd_output_oss_la_SOURCES= libs/audio/targets/snd_oss.c + +libs_audio_targets_snd_output_sgi_la_LDFLAGS= $(plugin_ldflags) +libs_audio_targets_snd_output_sgi_la_LIBADD= $(snd_deps) $(SGISND_LIBS) +libs_audio_targets_snd_output_sgi_la_DEPENDENCIES= $(snd_deps) +libs_audio_targets_snd_output_sgi_la_CFLAGS= $(SGISND_CFLAGS) +libs_audio_targets_snd_output_sgi_la_SOURCES= libs/audio/targets/snd_sgi.c + +libs_audio_targets_snd_output_sun_la_LDFLAGS= $(plugin_ldflags) +libs_audio_targets_snd_output_sun_la_DEPENDENCIES= $(snd_deps) +libs_audio_targets_snd_output_sun_la_CFLAGS= $(SUNSND_CFLAGS) +libs_audio_targets_snd_output_sun_la_SOURCES= libs/audio/targets/snd_sun.c + +libs_audio_targets_snd_output_win_la_LDFLAGS= $(plugin_ldflags) +libs_audio_targets_snd_output_win_la_LIBADD= $(snd_deps) $(WINSND_LIBS) $(plugin_libadd) +libs_audio_targets_snd_output_win_la_DEPENDENCIES= $(snd_deps) +libs_audio_targets_snd_output_win_la_CFLAGS= $(WIN32SND_CFLAGS) +libs_audio_targets_snd_output_win_la_SOURCES= libs/audio/targets/snd_win.c + +libs_audio_targets_snd_output_dx_la_LDFLAGS= $(plugin_ldflags) +libs_audio_targets_snd_output_dx_la_LIBADD= $(snd_deps) $(WINSND_LIBS) $(plugin_libadd) +libs_audio_targets_snd_output_dx_la_DEPENDENCIES= $(snd_deps) +libs_audio_targets_snd_output_dx_la_CFLAGS= $(WIN32SND_CFLAGS) +libs_audio_targets_snd_output_dx_la_SOURCES= libs/audio/targets/snd_dx.c + +libs_audio_targets_snd_output_disk_la_LDFLAGS= $(plugin_ldflags) +libs_audio_targets_snd_output_disk_la_LIBADD= $(snd_deps) $(plugin_libadd) +libs_audio_targets_snd_output_disk_la_DEPENDENCIES=$(snd_deps) +libs_audio_targets_snd_output_disk_la_CFLAGS= +libs_audio_targets_snd_output_disk_la_SOURCES= libs/audio/targets/snd_disk.c diff --git a/libs/audio/test/Makefile.am b/libs/audio/test/Makefile.am index 410be4f4e..ff6d259a4 100644 --- a/libs/audio/test/Makefile.am +++ b/libs/audio/test/Makefile.am @@ -7,9 +7,9 @@ noinst_PROGRAMS= @AUDIO_TARGETS@ EXTRA_PROGRAMS= testsound test_libs= \ - $(top_builddir)/libs/audio/libQFsound.la \ - $(top_builddir)/libs/ruamoko/libQFruamoko.la \ - $(top_builddir)/libs/util/libQFutil.la + libs/audio/libQFsound.la \ + libs/ruamoko/libQFruamoko.la \ + libs/util/libQFutil.la testsound_SOURCES= testsound.c testsound_LDADD= $(test_libs) diff --git a/libs/client/Makefile.am b/libs/client/Makefile.am deleted file mode 100644 index d9fc98a77..000000000 --- a/libs/client/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -noinst_LTLIBRARIES= libQFclient.la - -libQFclient_la_LDFLAGS= @STATIC@ -libQFclient_la_LIBADD= $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la -libQFclient_la_SOURCES= \ - cl_entities.c diff --git a/libs/client/Makemodule.am b/libs/client/Makemodule.am new file mode 100644 index 000000000..962430a4b --- /dev/null +++ b/libs/client/Makemodule.am @@ -0,0 +1,6 @@ +noinst_LTLIBRARIES += libs/client/libQFclient.la + +libs_client_libQFclient_la_LDFLAGS= @STATIC@ +libs_client_libQFclient_la_LIBADD= libs/gamecode/libQFgamecode.la libs/util/libQFutil.la +libs_client_libQFclient_la_SOURCES= \ + libs/client/cl_entities.c diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am deleted file mode 100644 index d7cce92e7..000000000 --- a/libs/console/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS) -plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir) -plugin_libadd= @plugin_libadd@ -lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ - -rpath $(libdir) -no-undefined -EXEEXT= - -lib_LTLIBRARIES= libQFconsole.la -plugin_LTLIBRARIES= @console_plugins@ -noinst_LTLIBRARIES= @client_static_plugins@ @server_static_plugins@ -EXTRA_LTLIBRARIES= console_server.la console_client.la - -common_sources= \ - buffer.c complete.c console.c inputline.c list.c filelist.c view.c -client_sources= bi_inputline.c client.c menu.c -server_sources= server.c - -console_deps=$(top_builddir)/libs/util/libQFutil.la -client_deps= libQFconsole.la \ - $(top_builddir)/libs/audio/libQFsound.la \ - $(top_builddir)/libs/ruamoko/libQFruamoko.la \ - $(top_builddir)/libs/gib/libQFgib.la \ - $(top_builddir)/libs/ruamoko/libQFruamoko.la \ - $(console_deps) -server_deps= libQFconsole.la $(console_deps) - -libQFconsole_la_LDFLAGS= $(lib_ldflags) -libQFconsole_la_LIBADD= $(console_deps) $(plugin_libadd) -libQFconsole_la_DEPENDENCIES= $(console_deps) -libQFconsole_la_SOURCES= $(common_sources) - -console_client_la_LDFLAGS= $(plugin_ldflags) -console_client_la_LIBADD= $(client_deps) $(plugin_libadd) -console_client_la_DEPENDENCIES= $(client_deps) -console_client_la_SOURCES= $(client_sources) - -console_server_la_LDFLAGS= $(plugin_ldflags) -console_server_la_LIBADD= $(server_deps) $(CURSES_LIBS) $(plugin_libadd) -console_server_la_DEPENDENCIES= $(server_deps) -console_server_la_SOURCES= $(server_sources) diff --git a/libs/console/Makemodule.am b/libs/console/Makemodule.am new file mode 100644 index 000000000..bd745a2e2 --- /dev/null +++ b/libs/console/Makemodule.am @@ -0,0 +1,33 @@ +lib_LTLIBRARIES += libs/console/libQFconsole.la +plugin_LTLIBRARIES += @console_plugins@ +noinst_LTLIBRARIES += @client_static_plugins@ @server_static_plugins@ +EXTRA_LTLIBRARIES += libs/console/console_server.la libs/console/console_client.la + +console_common_sources= \ + libs/console/buffer.c libs/console/complete.c libs/console/console.c libs/console/inputline.c libs/console/list.c libs/console/filelist.c libs/console/view.c +client_sources= libs/console/bi_inputline.c libs/console/client.c libs/console/menu.c +server_sources= libs/console/server.c + +console_deps=libs/util/libQFutil.la +client_deps= libs/console/libQFconsole.la \ + libs/audio/libQFsound.la \ + libs/ruamoko/libQFruamoko.la \ + libs/gib/libQFgib.la \ + libs/ruamoko/libQFruamoko.la \ + $(console_deps) +server_deps= libs/console/libQFconsole.la $(console_deps) + +libs_console_libQFconsole_la_LDFLAGS= $(lib_ldflags) +libs_console_libQFconsole_la_LIBADD= $(console_deps) $(plugin_libadd) +libs_console_libQFconsole_la_DEPENDENCIES= $(console_deps) +libs_console_libQFconsole_la_SOURCES= $(console_common_sources) + +libs_console_console_client_la_LDFLAGS= $(plugin_ldflags) +libs_console_console_client_la_LIBADD= $(client_deps) $(plugin_libadd) +libs_console_console_client_la_DEPENDENCIES= $(client_deps) +libs_console_console_client_la_SOURCES= $(client_sources) + +libs_console_console_server_la_LDFLAGS= $(plugin_ldflags) +libs_console_console_server_la_LIBADD= $(server_deps) $(CURSES_LIBS) $(plugin_libadd) +libs_console_console_server_la_DEPENDENCIES= $(server_deps) +libs_console_console_server_la_SOURCES= $(server_sources) diff --git a/libs/gamecode/Makefile.am b/libs/gamecode/Makefile.am deleted file mode 100644 index 6d31504a8..000000000 --- a/libs/gamecode/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include -lib_ldflags= - -gc_deps=$(top_builddir)/libs/util/libQFutil.la - -noinst_LTLIBRARIES= libQFgamecode.la - -libQFgamecode_la_LDFLAGS= $(lib_ldflags) -libQFgamecode_la_LIBADD= $(gc_deps) -libQFgamecode_la_DEPENDENCIES= $(gc_deps) -libQFgamecode_la_SOURCES= \ - pr_builtins.c pr_edict.c pr_debug.c pr_exec.c pr_load.c pr_parse.c \ - pr_opcode.c pr_resolve.c pr_resource.c pr_strings.c pr_zone.c diff --git a/libs/gamecode/Makemodule.am b/libs/gamecode/Makemodule.am new file mode 100644 index 000000000..dfae7c388 --- /dev/null +++ b/libs/gamecode/Makemodule.am @@ -0,0 +1,19 @@ +gc_deps=libs/util/libQFutil.la + +noinst_LTLIBRARIES += libs/gamecode/libQFgamecode.la + +libs_gamecode_libQFgamecode_la_LDFLAGS= +libs_gamecode_libQFgamecode_la_LIBADD= $(gc_deps) +libs_gamecode_libQFgamecode_la_DEPENDENCIES=$(gc_deps) +libs_gamecode_libQFgamecode_la_SOURCES= \ + libs/gamecode/pr_builtins.c \ + libs/gamecode/pr_edict.c \ + libs/gamecode/pr_debug.c \ + libs/gamecode/pr_exec.c \ + libs/gamecode/pr_load.c \ + libs/gamecode/pr_parse.c \ + libs/gamecode/pr_opcode.c \ + libs/gamecode/pr_resolve.c \ + libs/gamecode/pr_resource.c \ + libs/gamecode/pr_strings.c \ + libs/gamecode/pr_zone.c diff --git a/libs/gib/Makefile.am b/libs/gib/Makefile.am deleted file mode 100644 index 80ea92067..000000000 --- a/libs/gib/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -AUTOMAKE_OPTIONS= foreign -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS) - -lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ - -rpath $(libdir) -no-undefined - -gib_deps= \ - $(top_builddir)/libs/ruamoko/libQFruamoko.la \ - $(top_builddir)/libs/util/libQFutil.la - -lib_LTLIBRARIES= libQFgib.la - -libQFgib_la_LDFLAGS= $(lib_ldflags) -libQFgib_la_LIBADD= $(gib_deps) -libQFgib_la_DEPENDENCIES= $(gib_deps) -libQFgib_la_SOURCES= \ - bi_gib.c \ - gib_buffer.c gib_builtin.c gib_classes.c gib_execute.c gib_function.c \ - gib_parse.c gib_handle.c gib_object.c gib_process.c gib_regex.c \ - gib_thread.c gib_vars.c gib_init.c gib_tree.c \ - gib_semantics.c ops.c exp.c regex.c diff --git a/libs/gib/Makemodule.am b/libs/gib/Makemodule.am new file mode 100644 index 000000000..e0fbe14c2 --- /dev/null +++ b/libs/gib/Makemodule.am @@ -0,0 +1,29 @@ +gib_deps= \ + libs/ruamoko/libQFruamoko.la \ + libs/util/libQFutil.la + +lib_LTLIBRARIES += libs/gib/libQFgib.la + +libs_gib_libQFgib_la_LDFLAGS= $(lib_ldflags) +libs_gib_libQFgib_la_LIBADD= $(gib_deps) +libs_gib_libQFgib_la_DEPENDENCIES= $(gib_deps) +libs_gib_libQFgib_la_SOURCES= \ + libs/gib/bi_gib.c \ + libs/gib/gib_buffer.c \ + libs/gib/gib_builtin.c \ + libs/gib/gib_classes.c \ + libs/gib/gib_execute.c \ + libs/gib/gib_function.c \ + libs/gib/gib_parse.c \ + libs/gib/gib_handle.c \ + libs/gib/gib_object.c \ + libs/gib/gib_process.c \ + libs/gib/gib_regex.c \ + libs/gib/gib_thread.c \ + libs/gib/gib_vars.c \ + libs/gib/gib_init.c \ + libs/gib/gib_tree.c \ + libs/gib/gib_semantics.c \ + libs/gib/ops.c \ + libs/gib/exp.c \ + libs/gib/regex.c diff --git a/libs/image/Makefile.am b/libs/image/Makefile.am deleted file mode 100644 index 344bd7dd7..000000000 --- a/libs/image/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -AUTOMAKE_OPTIONS= foreign -AM_CFLAGS= @PREFER_PIC@ $(Z_CFLAGS) $(PNG_CFLAGS) -AM_CPPFLAGS= -I$(top_srcdir)/include - -lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ - -rpath $(libdir) -no-undefined - -image_deps=$(top_builddir)/libs/util/libQFutil.la - -lib_LTLIBRARIES= libQFimage.la - -libQFimage_la_LDFLAGS= $(lib_ldflags) -libQFimage_la_LIBADD= $(image_deps) $(PNG_LIBS) -libQFimage_la_DEPENDENCIES= $(pmage_deps) -libQFimage_la_SOURCES= \ - image.c pcx.c png.c tga.c - -EXTRA_DIST= diff --git a/libs/image/Makemodule.am b/libs/image/Makemodule.am new file mode 100644 index 000000000..786545ad2 --- /dev/null +++ b/libs/image/Makemodule.am @@ -0,0 +1,9 @@ +image_deps=libs/util/libQFutil.la + +lib_LTLIBRARIES += libs/image/libQFimage.la + +libs_image_libQFimage_la_LDFLAGS= $(lib_ldflags) +libs_image_libQFimage_la_LIBADD= $(image_deps) $(PNG_LIBS) +libs_image_libQFimage_la_DEPENDENCIES= $(image_deps) +libs_image_libQFimage_la_SOURCES= \ + libs/image/image.c libs/image/pcx.c libs/image/png.c libs/image/tga.c diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am deleted file mode 100644 index 2fa145649..000000000 --- a/libs/models/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= alias brush iqm sprite . test -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -lib_LTLIBRARIES= libQFmodels.la -noinst_LTLIBRARIES= @models_libs@ -EXTRA_LTLIBRARIES= libmodels_gl.la libmodels_glsl.la libmodels_sw.la - -lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ - -rpath $(libdir) -no-undefined - -models_sources = clip_hull.c model.c portal.c trace.c winding.c - -common_libs = \ - $(top_builddir)/libs/util/libQFutil.la - -models_libs=brush/libbrush.la $(common_libs) - -libQFmodels_la_LDFLAGS= $(lib_ldflags) -libQFmodels_la_LIBADD= $(models_libs) -libQFmodels_la_DEPENDENCIES= $(models_libs) -libQFmodels_la_SOURCES= $(models_sources) - -gl_sources=gl_model_fullbright.c gl_skin.c skin.c -gl_libs= \ - alias/libalias_gl.la \ - brush/libbrush_gl.la \ - iqm/libiqm_gl.la \ - sprite/libsprite_gl.la \ - $(top_builddir)/libs/image/libQFimage.la -libmodels_gl_la_LDFLAGS= -libmodels_gl_la_LIBADD= $(gl_libs) -libmodels_gl_la_DEPENDENCIES= $(gl_libs) -libmodels_gl_la_SOURCES= $(gl_sources) - -glsl_libs= \ - alias/libalias_glsl.la \ - brush/libbrush_glsl.la \ - iqm/libiqm_glsl.la \ - sprite/libsprite_glsl.la \ - $(top_builddir)/libs/image/libQFimage.la -libmodels_glsl_la_LDFLAGS= -libmodels_glsl_la_LIBADD= $(glsl_libs) -libmodels_glsl_la_DEPENDENCIES= $(glsl_libs) -libmodels_glsl_la_SOURCES= glsl_skin.c skin.c - -sw_libs= \ - alias/libalias_sw.la \ - brush/libbrush_sw.la \ - iqm/libiqm_sw.la \ - sprite/libsprite_sw.la \ - $(top_builddir)/libs/image/libQFimage.la -libmodels_sw_la_LDFLAGS= -libmodels_sw_la_LIBADD= $(sw_libs) -libmodels_sw_la_DEPENDENCIES= $(sw_libs) -libmodels_sw_la_SOURCES= sw_skin.c skin.c diff --git a/libs/models/Makemodule.am b/libs/models/Makemodule.am new file mode 100644 index 000000000..2fbc7380d --- /dev/null +++ b/libs/models/Makemodule.am @@ -0,0 +1,55 @@ +include libs/models/alias/Makemodule.am +include libs/models/brush/Makemodule.am +include libs/models/iqm/Makemodule.am +include libs/models/sprite/Makemodule.am +include libs/models/test/Makemodule.am + +lib_LTLIBRARIES += libs/models/libQFmodels.la +noinst_LTLIBRARIES += @models_libs@ +EXTRA_LTLIBRARIES += libs/models/libmodels_gl.la libs/models/libmodels_glsl.la libs/models/libmodels_sw.la + +models_sources = libs/models/clip_hull.c libs/models/model.c libs/models/portal.c libs/models/trace.c libs/models/winding.c + +common_libs = \ + libs/util/libQFutil.la + +models_libs=libs/models/brush/libbrush.la $(common_libs) + +libs_models_libQFmodels_la_LDFLAGS= $(lib_ldflags) +libs_models_libQFmodels_la_LIBADD= $(models_libs) +libs_models_libQFmodels_la_DEPENDENCIES= $(models_libs) +libs_models_libQFmodels_la_SOURCES= $(models_sources) + +gl_sources=libs/models/gl_model_fullbright.c libs/models/gl_skin.c libs/models/skin.c +gl_libs= \ + libs/models/alias/libalias_gl.la \ + libs/models/brush/libbrush_gl.la \ + libs/models/iqm/libiqm_gl.la \ + libs/models/sprite/libsprite_gl.la \ + libs/image/libQFimage.la +libs_models_libmodels_gl_la_LDFLAGS= +libs_models_libmodels_gl_la_LIBADD= $(gl_libs) +libs_models_libmodels_gl_la_DEPENDENCIES= $(gl_libs) +libs_models_libmodels_gl_la_SOURCES= $(gl_sources) + +glsl_libs= \ + libs/models/alias/libalias_glsl.la \ + libs/models/brush/libbrush_glsl.la \ + libs/models/iqm/libiqm_glsl.la \ + libs/models/sprite/libsprite_glsl.la \ + libs/image/libQFimage.la +libs_models_libmodels_glsl_la_LDFLAGS= +libs_models_libmodels_glsl_la_LIBADD= $(glsl_libs) +libs_models_libmodels_glsl_la_DEPENDENCIES= $(glsl_libs) +libs_models_libmodels_glsl_la_SOURCES= libs/models/glsl_skin.c libs/models/skin.c + +sw_libs= \ + libs/models/alias/libalias_sw.la \ + libs/models/brush/libbrush_sw.la \ + libs/models/iqm/libiqm_sw.la \ + libs/models/sprite/libsprite_sw.la \ + libs/image/libQFimage.la +libs_models_libmodels_sw_la_LDFLAGS= +libs_models_libmodels_sw_la_LIBADD= $(sw_libs) +libs_models_libmodels_sw_la_DEPENDENCIES= $(sw_libs) +libs_models_libmodels_sw_la_SOURCES= libs/models/sw_skin.c libs/models/skin.c diff --git a/libs/models/alias/Makefile.am b/libs/models/alias/Makefile.am deleted file mode 100644 index e74edfeda..000000000 --- a/libs/models/alias/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -noinst_LTLIBRARIES= @alias_libs@ -EXTRA_LTLIBRARIES=libalias_gl.la libalias_glsl.la libalias_sw.la - -alias_src= model_alias.c -gl_src= gl_mesh.c gl_model_alias.c floodfill.c -glsl_src= glsl_model_alias.c floodfill.c -sw_src= sw_model_alias.c - -libalias_gl_la_SOURCES= $(gl_src) $(alias_src) - -libalias_glsl_la_SOURCES= $(glsl_src) $(alias_src) - -libalias_sw_la_SOURCES= $(sw_src) $(alias_src) - -EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(alias_src) diff --git a/libs/models/alias/Makemodule.am b/libs/models/alias/Makemodule.am new file mode 100644 index 000000000..42f2c5a73 --- /dev/null +++ b/libs/models/alias/Makemodule.am @@ -0,0 +1,15 @@ +noinst_LTLIBRARIES += @alias_libs@ +EXTRA_LTLIBRARIES += libs/models/alias/libalias_gl.la libs/models/alias/libalias_glsl.la libs/models/alias/libalias_sw.la + +alias_src= libs/models/alias/model_alias.c +alias_gl_src= libs/models/alias/gl_mesh.c libs/models/alias/gl_model_alias.c libs/models/alias/floodfill.c +alias_glsl_src= libs/models/alias/glsl_model_alias.c libs/models/alias/floodfill.c +alias_sw_src= libs/models/alias/sw_model_alias.c + +libs_models_alias_libalias_gl_la_SOURCES= $(alias_gl_src) $(alias_src) + +libs_models_alias_libalias_glsl_la_SOURCES= $(alias_glsl_src) $(alias_src) + +libs_models_alias_libalias_sw_la_SOURCES= $(alias_sw_src) $(alias_src) + +EXTRA_DIST += $(alias_gl_src) $(alias_glsl_src) $(alias_sw_src) $(alias_src) diff --git a/libs/models/brush/Makefile.am b/libs/models/brush/Makefile.am deleted file mode 100644 index cd728baed..000000000 --- a/libs/models/brush/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -noinst_LTLIBRARIES= libbrush.la @brush_libs@ -EXTRA_LTLIBRARIES=libbrush_gl.la libbrush_glsl.la libbrush_sw.la - -brush_src= model_brush.c -gl_src= gl_model_brush.c -glsl_src= glsl_model_brush.c -sw_src= sw_model_brush.c - -libbrush_la_SOURCES= $(brush_src) - -libbrush_gl_la_SOURCES= $(gl_src) $(brush_src) - -libbrush_glsl_la_SOURCES= $(glsl_src) $(brush_src) - -libbrush_sw_la_SOURCES= $(sw_src) $(brush_src) - -EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(brush_src) diff --git a/libs/models/brush/Makemodule.am b/libs/models/brush/Makemodule.am new file mode 100644 index 000000000..a07ce0726 --- /dev/null +++ b/libs/models/brush/Makemodule.am @@ -0,0 +1,17 @@ +noinst_LTLIBRARIES += libs/models/brush/libbrush.la @brush_libs@ +EXTRA_LTLIBRARIES += libs/models/brush/libbrush_gl.la libs/models/brush/libbrush_glsl.la libs/models/brush/libbrush_sw.la + +brush_src= libs/models/brush/model_brush.c +brush_gl_src= libs/models/brush/gl_model_brush.c +brush_glsl_src= libs/models/brush/glsl_model_brush.c +brush_sw_src= libs/models/brush/sw_model_brush.c + +libs_models_brush_libbrush_la_SOURCES= $(brush_src) + +libs_models_brush_libbrush_gl_la_SOURCES= $(brush_gl_src) $(brush_src) + +libs_models_brush_libbrush_glsl_la_SOURCES= $(brush_glsl_src) $(brush_src) + +libs_models_brush_libbrush_sw_la_SOURCES= $(brush_sw_src) $(brush_src) + +EXTRA_DIST += $(brush_gl_src) $(brush_glsl_src) $(brush_sw_src) $(brush_src) diff --git a/libs/models/iqm/Makefile.am b/libs/models/iqm/Makefile.am deleted file mode 100644 index 71f54f576..000000000 --- a/libs/models/iqm/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -noinst_LTLIBRARIES= @iqm_libs@ -EXTRA_LTLIBRARIES=libiqm_gl.la libiqm_glsl.la libiqm_sw.la - -iqm_src= model_iqm.c -gl_src= gl_model_iqm.c -glsl_src= glsl_model_iqm.c -sw_src= sw_model_iqm.c - -libiqm_gl_la_SOURCES= $(gl_src) $(iqm_src) - -libiqm_glsl_la_SOURCES= $(glsl_src) $(iqm_src) - -libiqm_sw_la_SOURCES= $(sw_src) $(iqm_src) - -EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(iqm_src) diff --git a/libs/models/iqm/Makemodule.am b/libs/models/iqm/Makemodule.am new file mode 100644 index 000000000..20c29548b --- /dev/null +++ b/libs/models/iqm/Makemodule.am @@ -0,0 +1,15 @@ +noinst_LTLIBRARIES += @iqm_libs@ +EXTRA_LTLIBRARIES += libs/models/iqm/libiqm_gl.la libs/models/iqm/libiqm_glsl.la libs/models/iqm/libiqm_sw.la + +iqm_src= libs/models/iqm/model_iqm.c +iqm_gl_src= libs/models/iqm/gl_model_iqm.c +iqm_glsl_src= libs/models/iqm/glsl_model_iqm.c +iqm_sw_src= libs/models/iqm/sw_model_iqm.c + +libs_models_iqm_libiqm_gl_la_SOURCES= $(iqm_gl_src) $(iqm_src) + +libs_models_iqm_libiqm_glsl_la_SOURCES= $(iqm_glsl_src) $(iqm_src) + +libs_models_iqm_libiqm_sw_la_SOURCES= $(iqm_sw_src) $(iqm_src) + +EXTRA_DIST += $(iqm_gl_src) $(iqm_glsl_src) $(iqm_sw_src) $(iqm_src) diff --git a/libs/models/sprite/Makefile.am b/libs/models/sprite/Makefile.am deleted file mode 100644 index 3c6c023d1..000000000 --- a/libs/models/sprite/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -noinst_LTLIBRARIES= @sprite_libs@ -EXTRA_LTLIBRARIES=libsprite_gl.la libsprite_glsl.la libsprite_sw.la - -sprite_src= model_sprite.c -gl_src= gl_model_sprite.c -glsl_src= glsl_model_sprite.c -sw_src= sw_model_sprite.c - -libsprite_gl_la_SOURCES= $(gl_src) $(sprite_src) - -libsprite_glsl_la_SOURCES= $(glsl_src) $(sprite_src) - -libsprite_sw_la_SOURCES= $(sw_src) $(sprite_src) - -EXTRA_DIST= $(gl_src) $(glsl_src) $(sw_src) $(sprite_src) diff --git a/libs/models/sprite/Makemodule.am b/libs/models/sprite/Makemodule.am new file mode 100644 index 000000000..76b9fa714 --- /dev/null +++ b/libs/models/sprite/Makemodule.am @@ -0,0 +1,15 @@ +noinst_LTLIBRARIES += @sprite_libs@ +EXTRA_LTLIBRARIES += libs/models/sprite/libsprite_gl.la libs/models/sprite/libsprite_glsl.la libs/models/sprite/libsprite_sw.la + +sprite_src= libs/models/sprite/model_sprite.c +sprite_gl_src= libs/models/sprite/gl_model_sprite.c +sprite_glsl_src= libs/models/sprite/glsl_model_sprite.c +sprite_sw_src= libs/models/sprite/sw_model_sprite.c + +libs_models_sprite_libsprite_gl_la_SOURCES= $(sprite_gl_src) $(sprite_src) + +libs_models_sprite_libsprite_glsl_la_SOURCES= $(sprite_glsl_src) $(sprite_src) + +libs_models_sprite_libsprite_sw_la_SOURCES= $(sprite_sw_src) $(sprite_src) + +EXTRA_DIST += $(sprite_gl_src) $(sprite_glsl_src) $(sprite_sw_src) $(sprite_src) diff --git a/libs/models/test/Makefile.am b/libs/models/test/Makefile.am deleted file mode 100644 index 2718f5ddd..000000000 --- a/libs/models/test/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CPPFLAGS= -I$(srcdir) -I$(top_srcdir)/include - -check_PROGRAMS=testclip testcontents testportals -EXTRA_DIST= trace-id.c trace-qf-bad.c hulls.h main.c - -test_libs= \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/util/libQFutil.la - -testclip_SOURCES= testclip.c hulls.c -testclip_LDADD= $(test_libs) -testclip_DEPENDENCIES= $(test_libs) - -testcontents_SOURCES= testcontents.c hulls.c -testcontents_LDADD= $(test_libs) -testcontents_DEPENDENCIES= $(test_libs) - -testportals_SOURCES= testportals.c hulls.c -testportals_LDADD= $(test_libs) -testportals_DEPENDENCIES= $(test_libs) - -TESTS=$(check_PROGRAMS) diff --git a/libs/models/test/Makemodule.am b/libs/models/test/Makemodule.am new file mode 100644 index 000000000..15cbe5e35 --- /dev/null +++ b/libs/models/test/Makemodule.am @@ -0,0 +1,36 @@ +libs_model_tests = \ + libs/models/test/testclip \ + libs/models/test/testcontents \ + libs/models/test/testportals + +TESTS += $(libs_model_tests) + +check_PROGRAMS += $(libs_model_tests) + +EXTRA_DIST += \ + libs/models/test/trace-id.c \ + libs/models/test/trace-qf-bad.c \ + libs/models/test/hulls.h \ + libs/models/test/main.c + +test_libs= \ + libs/models/libQFmodels.la \ + libs/util/libQFutil.la + +libs_models_test_testclip_SOURCES= \ + libs/models/test/testclip.c \ + libs/models/test/hulls.c +libs_models_test_testclip_LDADD= $(test_libs) +libs_models_test_testclip_DEPENDENCIES= $(test_libs) + +libs_models_test_testcontents_SOURCES= \ + libs/models/test/testcontents.c \ + libs/models/test/hulls.c +libs_models_test_testcontents_LDADD= $(test_libs) +libs_models_test_testcontents_DEPENDENCIES= $(test_libs) + +libs_models_test_testportals_SOURCES= \ + libs/models/test/testportals.c \ + libs/models/test/hulls.c +libs_models_test_testportals_LDADD= $(test_libs) +libs_models_test_testportals_DEPENDENCIES= $(test_libs) diff --git a/libs/net/Makefile.am b/libs/net/Makefile.am deleted file mode 100644 index 69f2fbb6c..000000000 --- a/libs/net/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= nc nm -AM_CFLAGS= @PREFER_NON_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -noinst_LTLIBRARIES= libnet_chan.la libnet_main.la - -nc_libs=nc/libnc.la -libnet_chan_la_LDFLAGS= @STATIC@ -libnet_chan_la_LIBADD= $(nc_libs) -libnet_chan_la_DEPENDENCIES=$(nc_libs) -libnet_chan_la_SOURCES= net_chan.c - -nm_libs=nm/libnm.la -libnet_main_la_LDFLAGS= @STATIC@ -libnet_main_la_LIBADD= $(nm_libs) -libnet_main_la_DEPENDENCIES=$(nm_libs) -libnet_main_la_SOURCES= net_main.c diff --git a/libs/net/Makemodule.am b/libs/net/Makemodule.am new file mode 100644 index 000000000..05d0d0136 --- /dev/null +++ b/libs/net/Makemodule.am @@ -0,0 +1,14 @@ + +noinst_LTLIBRARIES += libs/net/libnet_chan.la libs/net/libnet_main.la + +include libs/net/nc/Makemodule.am +include libs/net/nm/Makemodule.am + +libs_net_libnet_chan_la_LDFLAGS= @STATIC@ +libs_net_libnet_chan_la_SOURCES= libs/net/net_chan.c ${nc_src} +EXTRA_libs_net_libnet_chan_la_SOURCES = $(ipv4_src) $(ipv6_src) + +nm_libs=nm/libnm.la +libs_net_libnet_main_la_LDFLAGS= @STATIC@ +libs_net_libnet_main_la_SOURCES= libs/net/net_main.c ${nm_src} +EXTRA_libs_net_libnet_main_la_SOURCES = $(nm_extra) diff --git a/libs/net/nc/Makefile.am b/libs/net/nc/Makefile.am deleted file mode 100644 index 08b0cb810..000000000 --- a/libs/net/nc/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_NON_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -noinst_LTLIBRARIES= libnc.la - -ipv6_src= net_udp6.c -ipv4_src= net_udp.c -if NETTYPE_IPV6 -ipvX_src= $(ipv6_src) -else -ipvX_src= $(ipv4_src) -endif -libnc_la_SOURCES= $(ipvX_src) -libnc_la_LDFLAGS= @STATIC@ -EXTRA_libnc_la_SOURCES= $(ipv4_src) $(ipv6_src) diff --git a/libs/net/nc/Makemodule.am b/libs/net/nc/Makemodule.am new file mode 100644 index 000000000..ae51d29e2 --- /dev/null +++ b/libs/net/nc/Makemodule.am @@ -0,0 +1,8 @@ +ipv6_src= libs/net/nc/net_udp6.c +ipv4_src= libs/net/nc/net_udp.c +if NETTYPE_IPV6 +ipvX_src= $(ipv6_src) +else +ipvX_src= $(ipv4_src) +endif +nc_src= $(ipvX_src) diff --git a/libs/net/nm/Makefile.am b/libs/net/nm/Makefile.am deleted file mode 100644 index cfdaae275..000000000 --- a/libs/net/nm/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_NON_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -noinst_LTLIBRARIES= libnm.la - -if SYSTYPE_WIN32 -net_sources= net_win.c net_wins.c -else -net_sources= net_bsd.c net_udp.c -endif -libnm_la_SOURCES= net_dgrm.c net_loop.c net_vcr.c $(net_sources) -libnm_la_LDFLAGS= @STATIC@ - - -EXTRA_libnm_la_SOURCES= \ - net_bsd.c net_win.c net_wins.c net_udp.c diff --git a/libs/net/nm/Makemodule.am b/libs/net/nm/Makemodule.am new file mode 100644 index 000000000..002b24b02 --- /dev/null +++ b/libs/net/nm/Makemodule.am @@ -0,0 +1,8 @@ +if SYSTYPE_WIN32 +net_sources= libs/net/nm/net_win.c libs/net/nm/net_wins.c +else +net_sources= libs/net/nm/net_bsd.c libs/net/nm/net_udp.c +endif +nm_src= libs/net/nm/net_dgrm.c libs/net/nm/net_loop.c libs/net/nm/net_vcr.c $(net_sources) + +nm_extra = libs/net/nm/net_bsd.c libs/net/nm/net_win.c libs/net/nm/net_wins.c libs/net/nm/net_udp.c diff --git a/libs/qw/Makefile.am b/libs/qw/Makefile.am deleted file mode 100644 index 48a58fa72..000000000 --- a/libs/qw/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CPPFLAGS= -I$(top_srcdir)/include - -noinst_LIBRARIES= libqw.a - -libqw_a_SOURCES= \ - msg_backbuf.c msg_ucmd.c diff --git a/libs/qw/Makemodule.am b/libs/qw/Makemodule.am new file mode 100644 index 000000000..42834b43a --- /dev/null +++ b/libs/qw/Makemodule.am @@ -0,0 +1,4 @@ +noinst_LIBRARIES += libs/qw/libqw.a + +libs_qw_libqw_a_SOURCES= \ + libs/qw/msg_backbuf.c libs/qw/msg_ucmd.c diff --git a/libs/ruamoko/Makefile.am b/libs/ruamoko/Makefile.am deleted file mode 100644 index 2d4777c14..000000000 --- a/libs/ruamoko/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS) - -lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ - -rpath $(libdir) -no-undefined -rua_libs= \ - $(top_builddir)/libs/gamecode/libQFgamecode.la \ - $(top_builddir)/libs/util/libQFutil.la - -lib_LTLIBRARIES= libQFruamoko.la - -libQFruamoko_la_LDFLAGS= $(lib_ldflags) -libQFruamoko_la_LIBADD= $(rua_libs) -libQFruamoko_la_DEPENDENCIES= $(rua_libs) -libQFruamoko_la_SOURCES= \ - pr_cmds.c \ - rua_cbuf.c rua_cmd.c rua_cvar.c rua_hash.c rua_init.c \ - rua_math.c rua_msgbuf.c rua_obj.c rua_plist.c rua_qfile.c rua_qfs.c \ - rua_runtime.c rua_script.c rua_set.c rua_string.c diff --git a/libs/ruamoko/Makemodule.am b/libs/ruamoko/Makemodule.am new file mode 100644 index 000000000..c3ed37383 --- /dev/null +++ b/libs/ruamoko/Makemodule.am @@ -0,0 +1,26 @@ +ruamoko_rua_libs= \ + libs/gamecode/libQFgamecode.la \ + libs/util/libQFutil.la + +lib_LTLIBRARIES += libs/ruamoko/libQFruamoko.la + +libs_ruamoko_libQFruamoko_la_LDFLAGS= $(lib_ldflags) +libs_ruamoko_libQFruamoko_la_LIBADD= $(ruamoko_rua_libs) +libs_ruamoko_libQFruamoko_la_DEPENDENCIES= $(ruamoko_rua_libs) +libs_ruamoko_libQFruamoko_la_SOURCES= \ + libs/ruamoko/pr_cmds.c \ + libs/ruamoko/rua_cbuf.c \ + libs/ruamoko/rua_cmd.c \ + libs/ruamoko/rua_cvar.c \ + libs/ruamoko/rua_hash.c \ + libs/ruamoko/rua_init.c \ + libs/ruamoko/rua_math.c \ + libs/ruamoko/rua_msgbuf.c \ + libs/ruamoko/rua_obj.c \ + libs/ruamoko/rua_plist.c \ + libs/ruamoko/rua_qfile.c \ + libs/ruamoko/rua_qfs.c \ + libs/ruamoko/rua_runtime.c \ + libs/ruamoko/rua_script.c \ + libs/ruamoko/rua_set.c \ + libs/ruamoko/rua_string.c diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am deleted file mode 100644 index c35e4e305..000000000 --- a/libs/util/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= . test - -AM_CFLAGS= @PREFER_PIC@ -CCASFLAGS+= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include $(Z_CFLAGS) $(FNM_FLAGS) - -lib_LTLIBRARIES= libQFutil.la - -lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ - -rpath $(libdir) -no-undefined - -if ASM_ARCH -asm= libasm.la -else -asm= -endif - -noinst_LTLIBRARIES= $(asm) -#EXTRA_LTLIBRARIES= libasm.la - -libasm_la_SOURCES= math.S sys_ia32.S - - -dirent_src= dirent.c -fnmatch_src= fnmatch.c -getopt_src= getopt.c getopt1.c - -if BUILD_DIRENT -dirent= $(dirent_src) -else -dirent= -endif - -if BUILD_FNMATCH -fnmatch= $(fnmatch_src) -else -fnmatch= -endif - -if BUILD_GETOPT -getopt= $(getopt_src) -else -getopt= -endif - -libQFutil_la_LDFLAGS= $(lib_ldflags) -libQFutil_la_LIBADD= $(asm) $(Z_LIBS) $(DL_LIBS) $(WIN32_LIBS) -libQFutil_la_DEPENDENCIES= $(asm) -libQFutil_la_SOURCES= \ - bspfile.c buildnum.c cbuf.c checksum.c cmd.c crc.c cvar.c dstring.c \ - fendian.c hash.c idparse.c info.c link.c llist.c \ - mathlib.c mdfour.c mersenne.c msg.c pakfile.c plugin.c qargs.c qendian.c \ - qfplist.c quakefs.c quakeio.c riff.c script.c segtext.c set.c sizebuf.c \ - string.c sys.c txtbuffer.c va.c ver_check.c vrect.c wad.c wadfile.c \ - zone.c \ - $(dirent) $(fnmatch) $(getopt) - -EXTRA_DIST= $(fnmatch_src) $(getopt_src) diff --git a/libs/util/Makemodule.am b/libs/util/Makemodule.am new file mode 100644 index 000000000..272459d4d --- /dev/null +++ b/libs/util/Makemodule.am @@ -0,0 +1,84 @@ +include libs/util/test/Makemodule.am + +lib_LTLIBRARIES += libs/util/libQFutil.la + +if ASM_ARCH +util_asm= libs/util/libasm.la +else +util_asm= +endif + +noinst_LTLIBRARIES += $(util_asm) +#EXTRA_LTLIBRARIES += libasm.la + +libs_util_libasm_la_SOURCES = libs/util/math.S libs/util/sys_ia32.S + + +dirent_src= libs/util/dirent.c +fnmatch_src= libs/util/fnmatch.c +getopt_src= libs/util/getopt.c libs/util/getopt1.c + +if BUILD_DIRENT +dirent= $(dirent_src) +else +dirent= +endif + +if BUILD_FNMATCH +fnmatch= $(fnmatch_src) +else +fnmatch= +endif + +if BUILD_GETOPT +getopt= $(getopt_src) +else +getopt= +endif + +libs_util_libQFutil_la_LDFLAGS= $(lib_ldflags) +libs_util_libQFutil_la_LIBADD= $(util_asm) $(Z_LIBS) $(DL_LIBS) $(WIN32_LIBS) +libs_util_libQFutil_la_DEPENDENCIES= $(util_asm) +libs_util_libQFutil_la_SOURCES= \ + libs/util/bspfile.c \ + libs/util/buildnum.c \ + libs/util/cbuf.c \ + libs/util/checksum.c \ + libs/util/cmd.c \ + libs/util/crc.c \ + libs/util/cvar.c \ + libs/util/dstring.c \ + libs/util/fendian.c \ + libs/util/hash.c \ + libs/util/idparse.c \ + libs/util/info.c \ + libs/util/link.c \ + libs/util/llist.c \ + libs/util/mathlib.c \ + libs/util/mdfour.c \ + libs/util/mersenne.c \ + libs/util/msg.c \ + libs/util/pakfile.c \ + libs/util/plugin.c \ + libs/util/qargs.c \ + libs/util/qendian.c \ + libs/util/qfplist.c \ + libs/util/quakefs.c \ + libs/util/quakeio.c \ + libs/util/riff.c \ + libs/util/script.c \ + libs/util/segtext.c \ + libs/util/set.c \ + libs/util/sizebuf.c \ + libs/util/string.c \ + libs/util/sys.c \ + libs/util/txtbuffer.c \ + libs/util/va.c \ + libs/util/ver_check.c \ + libs/util/vrect.c \ + libs/util/wad.c \ + libs/util/wadfile.c \ + libs/util/zone.c \ + $(dirent) $(fnmatch) $(getopt) + +EXTRA_DIST += $(fnmatch_src) $(getopt_src) diff --git a/libs/util/test/Makefile.am b/libs/util/test/Makefile.am deleted file mode 100644 index 74d9a2f4e..000000000 --- a/libs/util/test/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CPPFLAGS= -I$(top_srcdir)/include - -check_PROGRAMS= \ - test-bary test-cs test-darray test-dq test-half test-mat3 test-mat4 \ - test-plist test-qfs test-quat test-seb test-seg test-set test-txtbuffer \ - test-vrect - -test_bary_SOURCES=test-bary.c -test_bary_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_bary_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_cs_SOURCES=test-cs.c -test_cs_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_cs_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_darray_SOURCES=test-darray.c -test_darray_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_darray_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_dq_SOURCES=test-dq.c -test_dq_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_dq_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_half_SOURCES=test-half.c -test_half_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_half_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_mat3_SOURCES=test-mat3.c -test_mat3_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_mat3_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_mat4_SOURCES=test-mat4.c -test_mat4_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_mat4_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_plist_SOURCES=test-plist.c -test_plist_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_plist_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_qfs_SOURCES=test-qfs.c -test_qfs_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_qfs_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_quat_SOURCES=test-quat.c -test_quat_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_quat_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_seb_SOURCES=test-seb.c -test_seb_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_seb_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_seg_SOURCES=test-seg.c -test_seg_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_seg_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_set_SOURCES=test-set.c -test_set_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_set_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_txtbuffer_SOURCES=test-txtbuffer.c -test_txtbuffer_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_txtbuffer_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -test_vrect_SOURCES=test-vrect.c -test_vrect_LDADD=$(top_builddir)/libs/util/libQFutil.la -test_vrect_DEPENDENCIES=$(top_builddir)/libs/util/libQFutil.la - -TESTS=$(check_PROGRAMS) diff --git a/libs/util/test/Makemodule.am b/libs/util/test/Makemodule.am new file mode 100644 index 000000000..cf35f885c --- /dev/null +++ b/libs/util/test/Makemodule.am @@ -0,0 +1,79 @@ +libs_util_tests = \ + libs/util/test/test-bary \ + libs/util/test/test-cs \ + libs/util/test/test-darray \ + libs/util/test/test-dq \ + libs/util/test/test-half \ + libs/util/test/test-mat3 \ + libs/util/test/test-mat4 \ + libs/util/test/test-plist \ + libs/util/test/test-qfs \ + libs/util/test/test-quat \ + libs/util/test/test-seb \ + libs/util/test/test-seg \ + libs/util/test/test-set \ + libs/util/test/test-txtbuffer \ + libs/util/test/test-vrect +check_PROGRAMS += $(libs_util_tests) + +TESTS += $(libs_model_tests) + +libs_util_test_test_bary_SOURCES=libs/util/test/test-bary.c +libs_util_test_test_bary_LDADD=libs/util/libQFutil.la +libs_util_test_test_bary_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_cs_SOURCES=libs/util/test/test-cs.c +libs_util_test_test_cs_LDADD=libs/util/libQFutil.la +libs_util_test_test_cs_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_darray_SOURCES=libs/util/test/test-darray.c +libs_util_test_test_darray_LDADD=libs/util/libQFutil.la +libs_util_test_test_darray_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_dq_SOURCES=libs/util/test/test-dq.c +libs_util_test_test_dq_LDADD=libs/util/libQFutil.la +libs_util_test_test_dq_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_half_SOURCES=libs/util/test/test-half.c +libs_util_test_test_half_LDADD=libs/util/libQFutil.la +libs_util_test_test_half_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_mat3_SOURCES=libs/util/test/test-mat3.c +libs_util_test_test_mat3_LDADD=libs/util/libQFutil.la +libs_util_test_test_mat3_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_mat4_SOURCES=libs/util/test/test-mat4.c +libs_util_test_test_mat4_LDADD=libs/util/libQFutil.la +libs_util_test_test_mat4_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_plist_SOURCES=libs/util/test/test-plist.c +libs_util_test_test_plist_LDADD=libs/util/libQFutil.la +libs_util_test_test_plist_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_qfs_SOURCES=libs/util/test/test-qfs.c +libs_util_test_test_qfs_LDADD=libs/util/libQFutil.la +libs_util_test_test_qfs_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_quat_SOURCES=libs/util/test/test-quat.c +libs_util_test_test_quat_LDADD=libs/util/libQFutil.la +libs_util_test_test_quat_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_seb_SOURCES=libs/util/test/test-seb.c +libs_util_test_test_seb_LDADD=libs/util/libQFutil.la +libs_util_test_test_seb_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_seg_SOURCES=libs/util/test/test-seg.c +libs_util_test_test_seg_LDADD=libs/util/libQFutil.la +libs_util_test_test_seg_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_set_SOURCES=libs/util/test/test-set.c +libs_util_test_test_set_LDADD=libs/util/libQFutil.la +libs_util_test_test_set_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_txtbuffer_SOURCES=libs/util/test/test-txtbuffer.c +libs_util_test_test_txtbuffer_LDADD=libs/util/libQFutil.la +libs_util_test_test_txtbuffer_DEPENDENCIES=libs/util/libQFutil.la + +libs_util_test_test_vrect_SOURCES=libs/util/test/test-vrect.c +libs_util_test_test_vrect_LDADD=libs/util/libQFutil.la +libs_util_test_test_vrect_DEPENDENCIES=libs/util/libQFutil.la diff --git a/libs/video/Makefile.am b/libs/video/Makefile.am deleted file mode 100644 index 25b787b7c..000000000 --- a/libs/video/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= targets renderer - -clean-local: - rm -f *.a diff --git a/libs/video/Makemodule.am b/libs/video/Makemodule.am new file mode 100644 index 000000000..ae3d3ca44 --- /dev/null +++ b/libs/video/Makemodule.am @@ -0,0 +1,2 @@ +include libs/video/renderer/Makemodule.am +include libs/video/targets/Makemodule.am diff --git a/libs/video/renderer/Makefile.am b/libs/video/renderer/Makefile.am deleted file mode 100644 index 2c234fe33..000000000 --- a/libs/video/renderer/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= @vid_render_dirs@ -DIST_SUBDIRS= gl glsl sw sw32 -AM_CPPFLAGS= -I$(top_srcdir)/include - -lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ - -rpath $(libdir) -no-undefined -plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir) -plugin_libadd= @plugin_libadd@ -EXEEXT= - -#lib_LTLIBRARIES= @VID_REND_TARGETS@ -plugin_LTLIBRARIES= @vid_render_plugins@ -noinst_LTLIBRARIES= libQFrenderer.la @vid_render_static_plugins@ - -EXTRA_LTLIBRARIES= \ - vid_render_sw.la vid_render_sw32.la \ - vid_render_gl.la vid_render_glsl.la - -common_sources= \ - crosshair.c noisetextures.c r_alias.c r_bsp.c r_cvar.c r_dyn_textures.c \ - r_efrag.c r_ent.c r_graph.c r_iqm.c r_light.c r_main.c r_part.c \ - r_screen.c vid_common.c - -renderer_libs= \ - @vid_render_static_plugin_libs@ \ - $(top_builddir)/libs/util/libQFutil.la - -libQFrenderer_la_LDFLAGS= @STATIC@ -libQFrenderer_la_LIBADD= $(renderer_libs) -libQFrenderer_la_DEPENDENCIES= $(renderer_libs) -libQFrenderer_la_SOURCES= r_init.c r_progs.c - -gl_libs= \ - gl/libgl.la \ - $(top_builddir)/libs/models/libmodels_gl.la -vid_render_gl_la_LDFLAGS= $(plugin_ldflags) -vid_render_gl_la_LIBADD= $(gl_libs) -vid_render_gl_la_DEPENDENCIES= $(gl_libs) -vid_render_gl_la_SOURCES= $(common_sources) vid_render_gl.c - -glsl_libs= \ - glsl/libglsl.la \ - $(top_builddir)/libs/models/libmodels_glsl.la -vid_render_glsl_la_LDFLAGS= $(plugin_ldflags) -vid_render_glsl_la_LIBADD= $(glsl_libs) -vid_render_glsl_la_DEPENDENCIES=$(glsl_libs) -vid_render_glsl_la_SOURCES= $(common_sources) vid_render_glsl.c - -sw_libs= \ - sw/libsw.la \ - $(top_builddir)/libs/models/libmodels_sw.la -vid_render_sw_la_LDFLAGS= $(plugin_ldflags) -vid_render_sw_la_LIBADD= $(sw_libs) -vid_render_sw_la_DEPENDENCIES= $(sw_libs) -vid_render_sw_la_SOURCES= $(common_sources) vid_render_sw.c - -sw32_libs= \ - sw32/libsw32.la \ - $(top_builddir)/libs/models/libmodels_sw.la -vid_render_sw32_la_LDFLAGS= $(plugin_ldflags) -vid_render_sw32_la_LIBADD= $(sw32_libs) -vid_render_sw32_la_DEPENDENCIES=$(sw32_libs) -vid_render_sw32_la_SOURCES= $(common_sources) vid_render_sw32.c diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am new file mode 100644 index 000000000..2e56a95ae --- /dev/null +++ b/libs/video/renderer/Makemodule.am @@ -0,0 +1,185 @@ +#lib_LTLIBRARIES += @VID_REND_TARGETS@ +plugin_LTLIBRARIES += @vid_render_plugins@ +noinst_LTLIBRARIES += libs/video/renderer/libQFrenderer.la @vid_render_static_plugins@ + +EXTRA_LTLIBRARIES += \ + libs/video/renderer/vid_render_sw.la libs/video/renderer/vid_render_sw32.la \ + libs/video/renderer/vid_render_gl.la libs/video/renderer/vid_render_glsl.la + +video_renderer_common_sources= \ + libs/video/renderer/crosshair.c libs/video/renderer/noisetextures.c libs/video/renderer/r_alias.c libs/video/renderer/r_bsp.c libs/video/renderer/r_cvar.c libs/video/renderer/r_dyn_textures.c \ + libs/video/renderer/r_efrag.c libs/video/renderer/r_ent.c libs/video/renderer/r_graph.c libs/video/renderer/r_iqm.c libs/video/renderer/r_light.c libs/video/renderer/r_main.c libs/video/renderer/r_part.c \ + libs/video/renderer/r_screen.c libs/video/renderer/vid_common.c + +renderer_libs= \ + @vid_render_static_plugin_libs@ \ + libs/util/libQFutil.la + +libs_video_renderer_libQFrenderer_la_LDFLAGS= @STATIC@ +libs_video_renderer_libQFrenderer_la_LIBADD= $(renderer_libs) +libs_video_renderer_libQFrenderer_la_DEPENDENCIES= $(renderer_libs) +libs_video_renderer_libQFrenderer_la_SOURCES=\ + libs/video/renderer/r_init.c \ + libs/video/renderer/r_progs.c + +video_renderer_gl_libs= \ + libs/models/libmodels_gl.la +libs_video_renderer_vid_render_gl_la_LDFLAGS= $(plugin_ldflags) +libs_video_renderer_vid_render_gl_la_LIBADD= $(video_renderer_gl_libs) +libs_video_renderer_vid_render_gl_la_DEPENDENCIES= $(video_renderer_gl_libs) +libs_video_renderer_vid_render_gl_la_SOURCES=\ + $(video_renderer_common_sources) \ + libs/video/renderer/vid_render_gl.c \ + libs/video/renderer/gl/gl_draw.c \ + libs/video/renderer/gl/gl_dyn_lights.c \ + libs/video/renderer/gl/gl_dyn_part.c \ + libs/video/renderer/gl/gl_dyn_textures.c \ + libs/video/renderer/gl/gl_fog.c \ + libs/video/renderer/gl/gl_graph.c \ + libs/video/renderer/gl/gl_lightmap.c \ + libs/video/renderer/gl/gl_mod_alias.c \ + libs/video/renderer/gl/gl_mod_iqm.c \ + libs/video/renderer/gl/gl_mod_sprite.c \ + libs/video/renderer/gl/gl_rmain.c \ + libs/video/renderer/gl/gl_rmisc.c \ + libs/video/renderer/gl/gl_rsurf.c \ + libs/video/renderer/gl/gl_screen.c \ + libs/video/renderer/gl/gl_sky.c \ + libs/video/renderer/gl/gl_sky_clip.c \ + libs/video/renderer/gl/gl_textures.c \ + libs/video/renderer/gl/gl_warp.c \ + libs/video/renderer/gl/namehack.h \ + libs/video/renderer/gl/qfgl_ext.c \ + libs/video/renderer/gl/vid_common_gl.c \ + libs/video/renderer/gl/vtxarray.c + +shader_src= libs/video/renderer/glsl/quakeforge.glsl +shader_gen= libs/video/renderer/glsl/quakeforge.slc + +BUILT_SOURCES += $(shader_gen) + +SUFFICES=.frag .vert .fc .vc .slc .glsl +.glsl.slc: + sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@ + +video_renderer_glsl_libs= \ + libs/models/libmodels_glsl.la +libs_video_renderer_vid_render_glsl_la_LDFLAGS= $(plugin_ldflags) +libs_video_renderer_vid_render_glsl_la_LIBADD= $(video_renderer_glsl_libs) +libs_video_renderer_vid_render_glsl_la_DEPENDENCIES=$(video_renderer_glsl_libs) +libs_video_renderer_vid_render_glsl_la_SOURCES=\ + $(video_renderer_common_sources) \ + libs/video/renderer/vid_render_glsl.c \ + libs/video/renderer/glsl/glsl_alias.c \ + libs/video/renderer/glsl/glsl_bsp.c \ + libs/video/renderer/glsl/glsl_draw.c \ + libs/video/renderer/glsl/glsl_fog.c \ + libs/video/renderer/glsl/glsl_iqm.c \ + libs/video/renderer/glsl/glsl_lightmap.c \ + libs/video/renderer/glsl/glsl_main.c \ + libs/video/renderer/glsl/glsl_particles.c \ + libs/video/renderer/glsl/glsl_screen.c \ + libs/video/renderer/glsl/glsl_shader.c \ + libs/video/renderer/glsl/glsl_sprite.c \ + libs/video/renderer/glsl/glsl_textures.c \ + libs/video/renderer/glsl/namehack.h \ + libs/video/renderer/glsl/qfglsl.c \ + libs/video/renderer/glsl/quakeforge.glsl \ + libs/video/renderer/glsl/vid_common_glsl.c + +video_renderer_sw_libs= \ + libs/models/libmodels_sw.la +libs_video_renderer_vid_render_sw_la_LDFLAGS= $(plugin_ldflags) +libs_video_renderer_vid_render_sw_la_LIBADD= $(video_renderer_sw_libs) +libs_video_renderer_vid_render_sw_la_DEPENDENCIES= $(video_renderer_sw_libs) +libs_video_renderer_vid_render_sw_la_SOURCES=\ + $(video_renderer_common_sources) \ + libs/video/renderer/vid_render_sw.c \ + libs/video/renderer/sw/d_copy.S \ + libs/video/renderer/sw/d_draw.S \ + libs/video/renderer/sw/d_edge.c \ + libs/video/renderer/sw/d_fill.c \ + libs/video/renderer/sw/d_init.c \ + libs/video/renderer/sw/d_modech.c \ + libs/video/renderer/sw/d_part.c \ + libs/video/renderer/sw/d_parta.S \ + libs/video/renderer/sw/d_polysa.S \ + libs/video/renderer/sw/d_polyse.c \ + libs/video/renderer/sw/d_scan.c \ + libs/video/renderer/sw/d_scana.S \ + libs/video/renderer/sw/d_sky.c \ + libs/video/renderer/sw/d_spr8.S \ + libs/video/renderer/sw/d_sprite.c \ + libs/video/renderer/sw/d_surf.c \ + libs/video/renderer/sw/d_vars.c \ + libs/video/renderer/sw/d_varsa.S \ + libs/video/renderer/sw/d_zpoint.c \ + libs/video/renderer/sw/draw.c \ + libs/video/renderer/sw/fpu.c \ + libs/video/renderer/sw/fpua.S \ + libs/video/renderer/sw/nonintel.c \ + libs/video/renderer/sw/screen.c \ + libs/video/renderer/sw/surf8.S \ + libs/video/renderer/sw/sw_graph.c \ + libs/video/renderer/sw/sw_raclip.c \ + libs/video/renderer/sw/sw_raclipa.S \ + libs/video/renderer/sw/sw_ralias.c \ + libs/video/renderer/sw/sw_raliasa.S \ + libs/video/renderer/sw/sw_rbsp.c \ + libs/video/renderer/sw/sw_rdraw.c \ + libs/video/renderer/sw/sw_rdrawa.S \ + libs/video/renderer/sw/sw_redge.c \ + libs/video/renderer/sw/sw_redgea.S \ + libs/video/renderer/sw/sw_riqm.c \ + libs/video/renderer/sw/sw_rmain.c \ + libs/video/renderer/sw/sw_rmisc.c \ + libs/video/renderer/sw/sw_rpart.c \ + libs/video/renderer/sw/sw_rsky.c \ + libs/video/renderer/sw/sw_rsprite.c \ + libs/video/renderer/sw/sw_rsurf.c \ + libs/video/renderer/sw/sw_rvarsa.S \ + libs/video/renderer/sw/transform.S \ + libs/video/renderer/sw/vid_common_sw.c + +video_renderer_sw32_libs= \ + libs/models/libmodels_sw.la +libs_video_renderer_vid_render_sw32_la_LDFLAGS= $(plugin_ldflags) +libs_video_renderer_vid_render_sw32_la_LIBADD= $(video_renderer_sw32_libs) +libs_video_renderer_vid_render_sw32_la_DEPENDENCIES=$(video_renderer_sw32_libs) +libs_video_renderer_vid_render_sw32_la_SOURCES=\ + $(video_renderer_common_sources) \ + libs/video/renderer/vid_render_sw32.c \ + libs/video/renderer/sw32/d_edge.c \ + libs/video/renderer/sw32/d_fill.c \ + libs/video/renderer/sw32/d_init.c \ + libs/video/renderer/sw32/d_modech.c \ + libs/video/renderer/sw32/d_part.c \ + libs/video/renderer/sw32/d_polyse.c \ + libs/video/renderer/sw32/d_scan.c \ + libs/video/renderer/sw32/d_sky.c \ + libs/video/renderer/sw32/d_sprite.c \ + libs/video/renderer/sw32/d_surf.c \ + libs/video/renderer/sw32/d_vars.c \ + libs/video/renderer/sw32/d_zpoint.c \ + libs/video/renderer/sw32/draw.c \ + libs/video/renderer/sw32/namehack.h \ + libs/video/renderer/sw32/screen.c \ + libs/video/renderer/sw32/sw32_graph.c \ + libs/video/renderer/sw32/sw32_raclip.c \ + libs/video/renderer/sw32/sw32_ralias.c \ + libs/video/renderer/sw32/sw32_rbsp.c \ + libs/video/renderer/sw32/sw32_rdraw.c \ + libs/video/renderer/sw32/sw32_redge.c \ + libs/video/renderer/sw32/sw32_riqm.c \ + libs/video/renderer/sw32/sw32_rmain.c \ + libs/video/renderer/sw32/sw32_rmisc.c \ + libs/video/renderer/sw32/sw32_rpart.c \ + libs/video/renderer/sw32/sw32_rsky.c \ + libs/video/renderer/sw32/sw32_rsprite.c \ + libs/video/renderer/sw32/sw32_rsurf.c \ + libs/video/renderer/sw32/vid_common_sw32.c + +CLEANFILES += \ + libs/video/renderer/glsl/*.vc \ + libs/video/renderer/glsl/*.fc \ + libs/video/renderer/glsl/*.slc diff --git a/libs/video/renderer/gl/Makefile.am b/libs/video/renderer/gl/Makefile.am deleted file mode 100644 index 041db8546..000000000 --- a/libs/video/renderer/gl/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS) - -noinst_LTLIBRARIES= libgl.la - -gl_src = \ - gl_draw.c gl_dyn_lights.c gl_dyn_part.c gl_dyn_textures.c \ - gl_fog.c gl_graph.c gl_lightmap.c gl_mod_alias.c gl_mod_iqm.c \ - gl_mod_sprite.c gl_rmain.c gl_rmisc.c gl_rsurf.c gl_screen.c gl_sky.c \ - gl_sky_clip.c gl_textures.c gl_warp.c qfgl_ext.c vid_common_gl.c vtxarray.c - -libgl_la_SOURCES= $(gl_src) - -EXTRA_DIST = $(gl_src) namehack.h diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am deleted file mode 100644 index ca8f4314a..000000000 --- a/libs/video/renderer/glsl/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS) - -shader_src= quakeforge.glsl -shader_gen= quakeforge.slc - -glsl_src = \ - glsl_alias.c glsl_bsp.c glsl_draw.c glsl_fog.c glsl_iqm.c glsl_lightmap.c \ - glsl_main.c glsl_particles.c glsl_screen.c glsl_shader.c glsl_sprite.c \ - glsl_textures.c qfglsl.c vid_common_glsl.c - -noinst_LTLIBRARIES= libglsl.la -BUILT_SOURCES= $(shader_gen) - -SUFFICES=.frag .vert .fc .vc .slc .glsl -.glsl.slc: - sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@ -.frag.fc: - sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@ -.vert.vc: - sed -e 's/^/"/' -e 's/$$/\\n"/' $< > $@ - -libglsl_la_SOURCES= $(glsl_src) - -EXTRA_DIST = $(glsl_src) $(shader_src) namehack.h -CLEANFILES= *.vc *.fc *.slc diff --git a/libs/video/renderer/glsl/vid_common_glsl.c b/libs/video/renderer/glsl/vid_common_glsl.c index d684fd4ff..a437fd96e 100644 --- a/libs/video/renderer/glsl/vid_common_glsl.c +++ b/libs/video/renderer/glsl/vid_common_glsl.c @@ -57,7 +57,7 @@ #include "r_internal.h" static const char quakeforge_effect[] = -#include "quakeforge.slc" +#include "libs/video/renderer/glsl/quakeforge.slc" ; int glsl_palette; diff --git a/libs/video/renderer/sw/Makefile.am b/libs/video/renderer/sw/Makefile.am deleted file mode 100644 index 62f64e689..000000000 --- a/libs/video/renderer/sw/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -CCASFLAGS+= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -asm = @swrend_libs@ - -noinst_LTLIBRARIES= libsw.la $(asm) -EXTRA_LTLIBRARIES=libswrend_asm.la - -asm_src= \ - d_copy.S d_draw.S d_parta.S d_polysa.S d_scana.S d_spr8.S d_varsa.S \ - fpua.S surf8.S sw_raclipa.S sw_raliasa.S sw_rdrawa.S sw_redgea.S \ - sw_rvarsa.S transform.S - -sw_src= \ - d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c d_scan.c \ - d_sky.c d_sprite.c d_surf.c d_vars.c d_zpoint.c draw.c fpu.c nonintel.c \ - screen.c sw_graph.c sw_raclip.c sw_ralias.c sw_rbsp.c sw_rdraw.c \ - sw_redge.c sw_riqm.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c \ - sw_rsprite.c sw_rsurf.c \ - vid_common_sw.c - -libswrend_asm_la_LDFLAGS= @STATIC@ -libswrend_asm_la_SOURCES= $(asm_src) - -libsw_la_LDFLAGS= @STATIC@ -libsw_la_SOURCES= $(sw_src) -libsw_la_LIBADD= $(asm) -libsw_la_DEPENDENCIES= $(asm) - -EXTRA_DIST= $(sw_src) $(asm_src) diff --git a/libs/video/renderer/sw32/Makefile.am b/libs/video/renderer/sw32/Makefile.am deleted file mode 100644 index 5d078e90c..000000000 --- a/libs/video/renderer/sw32/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CFLAGS= @PREFER_PIC@ -AM_CPPFLAGS= -I$(top_srcdir)/include - -noinst_LTLIBRARIES= libsw32.la - -sw32_src= \ - d_edge.c d_fill.c d_init.c d_modech.c d_part.c d_polyse.c d_scan.c \ - d_sky.c d_sprite.c d_surf.c d_vars.c d_zpoint.c draw.c screen.c \ - sw32_graph.c sw32_raclip.c sw32_ralias.c sw32_rbsp.c sw32_rdraw.c \ - sw32_redge.c sw32_riqm.c sw32_rmain.c sw32_rmisc.c sw32_rpart.c \ - sw32_rsky.c sw32_rsprite.c sw32_rsurf.c \ - vid_common_sw32.c - -libsw32_la_SOURCES= $(sw32_src) - -EXTRA_DIST= $(sw32_src) namehack.h diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am deleted file mode 100644 index b883b676b..000000000 --- a/libs/video/targets/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -AM_CPPFLAGS= -I$(top_srcdir)/include - -lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \ - -rpath $(libdir) -no-undefined - -lib_LTLIBRARIES= @JOY_TARGETS@ - -noinst_LTLIBRARIES= @VID_TARGETS@ @vid_libs@ - -EXTRA_LTLIBRARIES= \ - libQFjs.la libQFfbdev.la libQFsvga.la libQFx11.la libQFsdl.la libQFwgl.la \ - libvid_common.la libvid_sdl.la \ - libvid_svga.la libvid_x11.la - -joy_linux_src= joy_linux.c -joy_win_src= joy_win.c -joy_null_src= joy_null.c -if JOYTYPE_LINUX -joy_src= $(joy_linux_src) -else -if JOYTYPE_WIN32 -joy_src= $(joy_win_src) -else -joy_src= $(joy_null_src) -endif -endif - -js_libs=$(top_builddir)/libs/util/libQFutil.la - -libQFjs_la_LDFLAGS= $(lib_ldflags) -libQFjs_la_LIBADD= $(js_libs) -libQFjs_la_DEPENDENCIES=$(js_libs) -libQFjs_la_CFLAGS= @PREFER_PIC@ $(JOY_CFLAGS) -libQFjs_la_SOURCES= joy.c $(joy_src) -EXTRA_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src) - -libvid_common_la_SOURCES= \ - in_common.c in_event.c keys.c old_keys.c pr_keys.c vid.c -libvid_common_la_CFLAGS= @PREFER_NON_PIC@ -libvid_common_la_LDFLAGS= @STATIC@ - -libvid_x11_la_SOURCES= in_x11.c context_x11.c dga_check.c -libvid_x11_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS) -libvid_x11_la_LDFLAGS= @STATIC@ - -libvid_svga_la_SOURCES= in_svgalib.c -libvid_svga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS) -libvid_svga_la_LDFLAGS= @STATIC@ - -libvid_sdl_la_SOURCES= in_sdl.c context_sdl.c -libvid_sdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS) -libvid_sdl_la_LDFLAGS= @STATIC@ - -# -# Linux FBdev -# -fbdev_c= fbset_modes_y.c fbset_modes_l.c -fbdev_h= fbset_modes_y.h -YFLAGS = -d -YACCLEX_CLEANFILES= $(fbdev_c) $(fbdev_h) -BUILT_SOURCES= $(fbdev_c) $(fbdev_h) - -fbdev_libs=libvid_common.la -libQFfbdev_la_CFLAGS= @PREFER_NON_PIC@ -libQFfbdev_la_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l \ - in_fbdev.c vid_fbdev.c -libQFfbdev_la_LDFLAGS= @STATIC@ -libQFfbdev_la_LIBADD= $(fbdev_libs) -libQFfbdev_la_DEPENDENCIES= $(fbdev_libs) - - -# -# Simple DirectMedia Library -# -sdl_libs=libvid_common.la libvid_sdl.la -libQFsdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS) -libQFsdl_la_SOURCES= vid_sdl.c -libQFsdl_la_LDFLAGS= @STATIC@ -libQFsdl_la_LIBADD= $(sdl_libs) -libQFsdl_la_DEPENDENCIES= $(sdl_libs) - -# -# SVGAlib -# -svga_libs=libvid_common.la libvid_svga.la -libQFsvga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS) -libQFsvga_la_SOURCES= vid_svgalib.c -libQFsvga_la_LDFLAGS= @STATIC@ -libQFsvga_la_LIBADD= $(svga_libs) -libQFsvga_la_DEPENDENCIES= $(svga_libs) - -# -# OpenGL in Win32 -# -wgl_libs=libvid_common.la libvid_gl.la -libQFwgl_la_CFLAGS= @PREFER_NON_PIC@ $(WGL_CFLAGS) -libQFwgl_la_SOURCES= in_win.c vid_wgl.c -libQFwgl_la_LDFLAGS= @STATIC@ -libQFwgl_la_LIBADD= $(wgl_libs) -libQFwgl_la_DEPENDENCIES= $(wgl_libs) - -# -# X11 software rendering -# -x11_libs=libvid_common.la libvid_x11.la -libQFx11_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS) -libQFx11_la_SOURCES= vid_x11.c -libQFx11_la_LDFLAGS= @STATIC@ -libQFx11_la_LIBADD= $(x11_libs) -libQFx11_la_DEPENDENCIES= $(x11_libs) - -# Kill the temp files, hopefully. -CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES) - -EXTRA_DIST= $(fbdev_c) $(fbdev_h) diff --git a/libs/video/targets/Makemodule.am b/libs/video/targets/Makemodule.am new file mode 100644 index 000000000..2a279c7a8 --- /dev/null +++ b/libs/video/targets/Makemodule.am @@ -0,0 +1,115 @@ +lib_LTLIBRARIES += @JOY_TARGETS@ + +noinst_LTLIBRARIES += @VID_TARGETS@ @vid_libs@ + +EXTRA_LTLIBRARIES += \ + libs/video/targets/libQFjs.la \ + libs/video/targets/libQFfbdev.la \ + libs/video/targets/libQFsvga.la \ + libs/video/targets/libQFx11.la \ + libs/video/targets/libQFsdl.la \ + libs/video/targets/libQFwgl.la \ + libs/video/targets/libvid_common.la \ + libs/video/targets/libvid_sdl.la \ + libs/video/targets/libvid_svga.la \ + libs/video/targets/libvid_x11.la + +joy_linux_src= libs/video/targets/joy_linux.c +joy_win_src= libs/video/targets/joy_win.c +joy_null_src= libs/video/targets/joy_null.c +if JOYTYPE_LINUX +joy_src= $(joy_linux_src) +else +if JOYTYPE_WIN32 +joy_src= $(joy_win_src) +else +joy_src= $(joy_null_src) +endif +endif + +js_libs=libs/util/libQFutil.la + +libs_video_targets_libQFjs_la_LDFLAGS= $(lib_ldflags) +libs_video_targets_libQFjs_la_LIBADD= $(js_libs) +libs_video_targets_libQFjs_la_DEPENDENCIES=$(js_libs) +libs_video_targets_libQFjs_la_CFLAGS= @PREFER_PIC@ $(JOY_CFLAGS) +libs_video_targets_libQFjs_la_SOURCES= libs/video/targets/joy.c $(joy_src) +EXTRA_libs_video_targets_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src) + +libs_video_targets_libvid_common_la_SOURCES= \ + libs/video/targets/in_common.c libs/video/targets/in_event.c libs/video/targets/keys.c libs/video/targets/old_keys.c libs/video/targets/pr_keys.c libs/video/targets/vid.c +libs_video_targets_libvid_common_la_CFLAGS= @PREFER_NON_PIC@ +libs_video_targets_libvid_common_la_LDFLAGS= @STATIC@ + +libs_video_targets_libvid_x11_la_SOURCES= libs/video/targets/in_x11.c libs/video/targets/context_x11.c libs/video/targets/dga_check.c +libs_video_targets_libvid_x11_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS) +libs_video_targets_libvid_x11_la_LDFLAGS= @STATIC@ + +libs_video_targets_libvid_svga_la_SOURCES= libs/video/targets/in_svgalib.c +libs_video_targets_libvid_svga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS) +libs_video_targets_libvid_svga_la_LDFLAGS= @STATIC@ + +libs_video_targets_libvid_sdl_la_SOURCES= libs/video/targets/in_sdl.c libs/video/targets/context_sdl.c +libs_video_targets_libvid_sdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS) +libs_video_targets_libvid_sdl_la_LDFLAGS= @STATIC@ + +# +# Linux FBdev +# +fbdev_c= libs/video/targets/fbset_modes_y.c libs/video/targets/fbset_modes_l.c +fbdev_h= libs/video/targets/fbset_modes_y.h +YACCLEX_CLEANFILES = $(fbdev_c) $(fbdev_h) +BUILT_SOURCES += $(fbdev_c) $(fbdev_h) + +fbdev_libs=libs/video/targets/libvid_common.la +libs_video_targets_libQFfbdev_la_CFLAGS= @PREFER_NON_PIC@ +libs_video_targets_libQFfbdev_la_SOURCES= libs/video/targets/fbset.c libs/video/targets/fbset_modes_y.y libs/video/targets/fbset_modes_l.l \ + libs/video/targets/in_fbdev.c libs/video/targets/vid_fbdev.c +libs_video_targets_libQFfbdev_la_LDFLAGS= @STATIC@ +libs_video_targets_libQFfbdev_la_LIBADD= $(fbdev_libs) +libs_video_targets_libQFfbdev_la_DEPENDENCIES= $(fbdev_libs) + + +# +# Simple DirectMedia Library +# +sdl_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_sdl.la +libs_video_targets_libQFsdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS) +libs_video_targets_libQFsdl_la_SOURCES= libs/video/targets/vid_sdl.c +libs_video_targets_libQFsdl_la_LDFLAGS= @STATIC@ +libs_video_targets_libQFsdl_la_LIBADD= $(sdl_libs) +libs_video_targets_libQFsdl_la_DEPENDENCIES= $(sdl_libs) + +# +# SVGAlib +# +svga_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_svga.la +libs_video_targets_libQFsvga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS) +libs_video_targets_libQFsvga_la_SOURCES= libs/video/targets/vid_svgalib.c +libs_video_targets_libQFsvga_la_LDFLAGS= @STATIC@ +libs_video_targets_libQFsvga_la_LIBADD= $(svga_libs) +libs_video_targets_libQFsvga_la_DEPENDENCIES= $(svga_libs) + +# +# OpenGL in Win32 +# +wgl_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_gl.la +libs_video_targets_libQFwgl_la_CFLAGS= @PREFER_NON_PIC@ $(WGL_CFLAGS) +libs_video_targets_libQFwgl_la_SOURCES= libs/video/targets/in_win.c libs/video/targets/vid_wgl.c +libs_video_targets_libQFwgl_la_LDFLAGS= @STATIC@ +libs_video_targets_libQFwgl_la_LIBADD= $(wgl_libs) +libs_video_targets_libQFwgl_la_DEPENDENCIES= $(wgl_libs) + +# +# X11 software rendering +# +x11_libs=libs/video/targets/libvid_common.la libs/video/targets/libvid_x11.la +libs_video_targets_libQFx11_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS) +libs_video_targets_libQFx11_la_SOURCES= libs/video/targets/vid_x11.c +libs_video_targets_libQFx11_la_LDFLAGS= @STATIC@ +libs_video_targets_libQFx11_la_LIBADD= $(x11_libs) +libs_video_targets_libQFx11_la_DEPENDENCIES= $(x11_libs) + +CLEANFILES += *.i *.s $(YACCLEX_CLEANFILES) + +EXTRA_DIST += $(fbdev_c) $(fbdev_h) diff --git a/m4/quakeforge.m4 b/m4/quakeforge.m4 index 2c3139733..984cd71f7 100644 --- a/m4/quakeforge.m4 +++ b/m4/quakeforge.m4 @@ -93,7 +93,7 @@ AC_DEFUN([QF_NEED], [m4_map_args_w([$2], [$1_need_], [=yes], [;])]) AC_DEFUN([QF_PROCESS_NEED_subroutine], [m4_foreach_w([qfn_need], [$5], [if test x"${$2[_need_]qfn_need}" = xyes; then - $4="${$4} $1[]qfn_need[]$3" + $4="${$4} m4_join([/],[$6],[$1])[]qfn_need[]$3" fi ])]) @@ -105,8 +105,8 @@ fi ])]) AC_DEFUN([QF_PROCESS_NEED_LIBS], -[m4_define([qfn_ext], m4_default($3,[la])) -QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.]qfn_ext,[$1_libs],[$2]) +[m4_define([qfn_ext], m4_default($4,[la])) +QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.]qfn_ext,[$1_libs],[$2],[$3]) QF_SUBST([$1_libs])]) AC_DEFUN([QF_PROCESS_NEED_DIRS], @@ -122,11 +122,11 @@ AC_DEFINE_UNQUOTED(m4_toupper(qfn_default), ["${qfn_default}"], [Define to defau ]) AC_DEFUN([QF_PROCESS_NEED_PLUGINS], -[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],[$1_plugins],[$2]) +[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],[$1_plugins],[$2],[$3]) QF_SUBST([$1_plugins]) -QF_DEFAULT_PLUGIN([$1],[$2],[$3]) -AC_DEFINE_UNQUOTED(m4_toupper(m4_default($3,$1)[_plugin_protos]), [], [list of $1 plugin prototypes]) -AC_DEFINE_UNQUOTED(m4_toupper(m4_default($3,$1)[_plugin_list]), [{0, 0}], [list of $1 plugins]) +QF_DEFAULT_PLUGIN([$1],[$2],[$4]) +AC_DEFINE_UNQUOTED(m4_toupper(m4_default($4,$1)[_plugin_protos]), [], [list of $1 plugin prototypes]) +AC_DEFINE_UNQUOTED(m4_toupper(m4_default($4,$1)[_plugin_list]), [{0, 0}], [list of $1 plugins]) ]) AC_DEFUN([QF_STATIC_PLUGIN_LIBS], @@ -147,7 +147,7 @@ fi AC_DEFINE_UNQUOTED(m4_toupper([$1_plugin_list]), [${$1_plugin_list}], [list of $1 plugins])]) AC_DEFUN([QF_PROCESS_NEED_STATIC_PLUGINS], -[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],m4_default($4,$1)[_static_plugins],[$2]) +[QF_PROCESS_NEED_subroutine([$1_],[$1],[.la],m4_default($4,$1)[_static_plugins],[$2],[$3]) QF_SUBST(m4_default($4,$1)[_static_plugins]) QF_DEFAULT_PLUGIN([$1],[$2],[$4]) QF_STATIC_PLUGIN_LIBS(m4_default($4,$1),[$1],[$2],[$3]) diff --git a/nq/Makefile.am b/nq/Makefile.am deleted file mode 100644 index 77e3cbf5b..000000000 --- a/nq/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= include source diff --git a/nq/Makemodule.am b/nq/Makemodule.am new file mode 100644 index 000000000..7e28f6401 --- /dev/null +++ b/nq/Makemodule.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in +include nq/include/Makemodule.am +include nq/source/Makemodule.am diff --git a/nq/include/Makefile.am b/nq/include/Makefile.am deleted file mode 100644 index 60374efe3..000000000 --- a/nq/include/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -## Process this file with automake to produce Makefile.in -EXTRA_DIST= chase.h cl_skin.h client.h game.h host.h protocol.h server.h \ - sv_pr_cmds.h sv_progs.h diff --git a/nq/include/Makemodule.am b/nq/include/Makemodule.am new file mode 100644 index 000000000..ba1076749 --- /dev/null +++ b/nq/include/Makemodule.am @@ -0,0 +1,11 @@ +## Process this file with automake to produce Makefile.in +EXTRA_DIST += \ + nq/include/chase.h \ + nq/include/cl_skin.h \ + nq/include/client.h \ + nq/include/game.h \ + nq/include/host.h \ + nq/include/protocol.h \ + nq/include/server.h \ + nq/include/sv_pr_cmds.h \ + nq/include/sv_progs.h diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am deleted file mode 100644 index 71cb290e8..000000000 --- a/nq/source/Makefile.am +++ /dev/null @@ -1,176 +0,0 @@ -## Process this file with automake to produce Makefile.in -# -# Makefile.am -# -# Automake-using build system for QuakeForge -# -# Copyright (C) 2000 Jeff Teunissen -# -# This Makefile is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to: -# -# Free Software Foundation, Inc. -# 59 Temple Place - Suite 330 -# Boston, MA 02111-1307, USA -# -# $Id$ -# -AUTOMAKE_OPTIONS= foreign - -# Stuff that is common to both client and server -# -AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/nq/include -SDL_LIBS = @SDL_LIBS@ -AM_CFLAGS= @PTHREAD_CFLAGS@ - -bin_PROGRAMS= @NQ_TARGETS@ - -EXTRA_PROGRAMS= nq-fbdev nq-sdl nq-svga nq-wgl nq-x11 nq-server - -noinst_LIBRARIES= @nq_libs@ -EXTRA_LIBRARIES=libnq_client.a libnq_common.a libnq_sdl.a libnq_server.a - -libnq_common_a_SOURCES=game.c world.c -libnq_sdl_a_SOURCES= sys_sdl.c -libnq_sdl_a_CFLAGS= $(SDL_CFLAGS) - -common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@ - -cl_plugin_LIBS= \ - @server_static_plugin_libs@ \ - @client_static_plugin_libs@ - -client_LIBFILES= \ - $(top_builddir)/libs/video/targets/libQFjs.la \ - $(top_builddir)/libs/audio/libQFcd.la \ - $(top_builddir)/libs/audio/libQFsound.la - -server_LIBFILES= \ - @server_static_plugin_libs@ \ - $(top_builddir)/libs/models/libQFmodels.la - -common_LIBFILES= \ - $(top_builddir)/libs/net/libnet_main.la \ - $(top_builddir)/libs/console/libQFconsole.la \ - $(top_builddir)/libs/image/libQFimage.la \ - $(top_builddir)/libs/gib/libQFgib.la \ - $(top_builddir)/libs/ruamoko/libQFruamoko.la \ - $(top_builddir)/libs/util/libQFutil.la - -client_LIBS= $(client_LIBFILES) $(common_LIBFILES) - -server_LIBS= $(server_LIBFILES) $(common_LIBFILES) $(NET_LIBS) -server_LIB_DEPS=$(server_LIBFILES) $(common_LIBFILES) - -libnq_client_a_SOURCES= \ - cl_chase.c cl_cmd.c cl_demo.c cl_ents.c cl_input.c cl_main.c \ - cl_screen.c cl_parse.c cl_tent.c cl_view.c sbar.c - -libnq_server_a_SOURCES= \ - host.c host_cmd.c sv_cl_phys.c sv_cvar.c sv_main.c \ - sv_move.c sv_phys.c sv_pr_cmds.c sv_progs.c sv_user.c - -client_libs= libnq_server.a libnq_client.a libnq_common.a \ - $(top_builddir)/libs/client/libQFclient.la -server_libs = libnq_server.a libnq_common.a - -# Software-rendering targets - -# ... Linux FBDev -nq_fbdev_libs= \ - $(client_libs) \ - $(cl_plugin_LIBS) \ - $(top_builddir)/libs/video/renderer/libQFrenderer.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/video/targets/libQFfbdev.la \ - $(client_LIBS) -nq_fbdev_SOURCES= sys_unix.c -nq_fbdev_LDADD= $(nq_fbdev_libs) $(NET_LIBS) -nq_fbdev_LDFLAGS= $(common_ldflags) -nq_fbdev_DEPENDENCIES= $(nq_fbdev_libs) - -# ... SDL, version 1.2 and higher -nq_sdl_libs= \ - libnq_sdl.a \ - $(client_libs) \ - $(cl_plugin_LIBS) \ - $(top_builddir)/libs/video/renderer/libQFrenderer.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/video/targets/libQFsdl.la \ - $(client_LIBS) -nq_sdl_SOURCES=sdl_link.c -nq_sdl_LDADD= $(nq_sdl_libs) $(SDL_LIBS) $(NET_LIBS) -nq_sdl_LDFLAGS= $(common_ldflags) -nq_sdl_DEPENDENCIES= $(nq_sdl_libs) - -# ... Linux SVGAlib -nq_svga_libs= \ - $(client_libs) \ - $(cl_plugin_LIBS) \ - $(top_builddir)/libs/video/renderer/libQFrenderer.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/video/targets/libQFsvga.la \ - $(client_LIBS) -nq_svga_SOURCES= sys_unix.c -nq_svga_LDADD= $(nq_svga_libs) $(SVGA_LIBS) $(NET_LIBS) -nq_svga_LDFLAGS= $(common_ldflags) -nq_svga_DEPENDENCIES= $(nq_svga_libs) - -# ... X11 -nq_x11_libs= \ - $(client_libs) \ - $(cl_plugin_LIBS) \ - $(top_builddir)/libs/video/renderer/libQFrenderer.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/video/targets/libQFx11.la \ - $(client_LIBS) -nq_x11_SOURCES= sys_unix.c -nq_x11_LDADD= $(nq_x11_libs) \ - $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \ - $(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(DL_LIBS) -nq_x11_LDFLAGS= $(common_ldflags) -nq_x11_DEPENDENCIES= $(nq_x11_libs) - -# OpenGL-using targets - -# ... SGI/Microsoft WGL (Windows OpenGL) -nq_wgl_libs= \ - $(client_libs) \ - $(cl_plugin_LIBS) \ - $(opengl_QFLIBS) \ - $(top_builddir)/libs/video/targets/libQFwgl.la \ - $(client_LIBS) -nq_wgl_SOURCES= sys_win.c -nq_wgl_LDADD= $(nq_wgl_libs) -lgdi32 -lcomctl32 -lwinmm $(NET_LIBS) -nq_wgl_LDFLAGS= $(common_ldflags) -nq_wgl_DEPENDENCIES= $(nq_wgl_libs) - -# Dedicated Server -if SYSTYPE_WIN32 -ded_sources= sys_wind.c sv_ded.c -else -ded_sources= sys_unixd.c sv_ded.c -endif -EXTRA_DIST=sys_wind.c sys_unixd.c sv_ded.c - -nq_server_LDFLAGS= $(common_ldflags) -nq_server_SOURCES= $(ded_sources) -nq_server_LDADD= $(server_libs) $(server_LIBS) -nq_server_DEPENDENCIES= $(server_libs) $(server_LIB_DEPS) - -# Stuff that doesn't get linked into an executable NEEDS to be mentioned here, -# or it won't be distributed with 'make dist' - -# Kill the temp files, hopefully. -CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES) diff --git a/nq/source/Makemodule.am b/nq/source/Makemodule.am new file mode 100644 index 000000000..2157cd42b --- /dev/null +++ b/nq/source/Makemodule.am @@ -0,0 +1,164 @@ +## Process this file with automake to produce Makefile.in +# +# Makefile.am +# +# Automake-using build system for QuakeForge +# +# Copyright (C) 2000 Jeff Teunissen +# +# This Makefile is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to: +# +# Free Software Foundation, Inc. +# 59 Temple Place - Suite 330 +# Boston, MA 02111-1307, USA +# +# $Id$ +# + +# Stuff that is common to both client and server +# +bin_PROGRAMS += @NQ_TARGETS@ + +EXTRA_PROGRAMS += nq-fbdev nq-sdl nq-svga nq-wgl nq-x11 nq-server + +noinst_LIBRARIES += @nq_libs@ +EXTRA_LIBRARIES += nq/source/libnq_client.a nq/source/libnq_common.a nq/source/libnq_sdl.a nq/source/libnq_server.a + +nq_source_libnq_common_a_SOURCES= nq/source/game.c nq/source/world.c +nq_source_libnq_sdl_a_SOURCES= nq/source/sys_sdl.c +nq_source_libnq_sdl_a_CFLAGS= $(SDL_CFLAGS) + +nq_cl_plugin_LIBS= \ + @server_static_plugin_libs@ \ + @client_static_plugin_libs@ + +nq_client_LIBFILES= \ + libs/video/targets/libQFjs.la \ + libs/audio/libQFcd.la \ + libs/audio/libQFsound.la + +nq_server_LIBFILES= \ + @server_static_plugin_libs@ \ + libs/models/libQFmodels.la + +nq_common_LIBFILES= \ + libs/net/libnet_main.la \ + libs/console/libQFconsole.la \ + libs/image/libQFimage.la \ + libs/gib/libQFgib.la \ + libs/ruamoko/libQFruamoko.la \ + libs/gamecode/libQFgamecode.la \ + libs/util/libQFutil.la + +nq_client_LIBS= $(nq_client_LIBFILES) $(nq_common_LIBFILES) + +nq_server_LIBS= $(nq_server_LIBFILES) $(nq_common_LIBFILES) $(NET_LIBS) +nq_server_LIB_DEPS=$(nq_server_LIBFILES) $(nq_common_LIBFILES) + +nq_source_libnq_client_a_SOURCES= \ + nq/source/cl_chase.c nq/source/cl_cmd.c nq/source/cl_demo.c nq/source/cl_ents.c nq/source/cl_input.c nq/source/cl_main.c \ + nq/source/cl_screen.c nq/source/cl_parse.c nq/source/cl_tent.c nq/source/cl_view.c nq/source/sbar.c + +nq_source_libnq_server_a_SOURCES= \ + nq/source/host.c nq/source/host_cmd.c nq/source/sv_cl_phys.c nq/source/sv_cvar.c nq/source/sv_main.c \ + nq/source/sv_move.c nq/source/sv_phys.c nq/source/sv_pr_cmds.c nq/source/sv_progs.c nq/source/sv_user.c + +nq_client_libs= nq/source/libnq_server.a nq/source/libnq_client.a nq/source/libnq_common.a \ + libs/client/libQFclient.la +server_libs = nq/source/libnq_server.a nq/source/libnq_common.a + +# Software-rendering targets + +# ... Linux FBDev +nq_fbdev_libs= \ + $(nq_client_libs) \ + $(nq_cl_plugin_LIBS) \ + libs/video/renderer/libQFrenderer.la \ + libs/models/libQFmodels.la \ + libs/video/targets/libQFfbdev.la \ + $(nq_client_LIBS) +nq_fbdev_SOURCES= nq/source/sys_unix.c +nq_fbdev_LDADD= $(nq_fbdev_libs) $(NET_LIBS) +nq_fbdev_LDFLAGS= $(common_ldflags) +nq_fbdev_DEPENDENCIES= $(nq_fbdev_libs) + +# ... SDL, version 1.2 and higher +nq_sdl_libs= \ + nq/source/libnq_sdl.a \ + $(nq_client_libs) \ + $(nq_cl_plugin_LIBS) \ + libs/video/renderer/libQFrenderer.la \ + libs/models/libQFmodels.la \ + libs/video/targets/libQFsdl.la \ + $(nq_client_LIBS) +nq_sdl_SOURCES=nq/source/sdl_link.c +nq_sdl_LDADD= $(nq_sdl_libs) $(SDL_LIBS) $(NET_LIBS) +nq_sdl_LDFLAGS= $(common_ldflags) +nq_sdl_DEPENDENCIES= $(nq_sdl_libs) + +# ... Linux SVGAlib +nq_svga_libs= \ + $(nq_client_libs) \ + $(nq_cl_plugin_LIBS) \ + libs/video/renderer/libQFrenderer.la \ + libs/models/libQFmodels.la \ + libs/video/targets/libQFsvga.la \ + $(nq_client_LIBS) +nq_svga_SOURCES= nq/source/sys_unix.c +nq_svga_LDADD= $(nq_svga_libs) $(SVGA_LIBS) $(NET_LIBS) +nq_svga_LDFLAGS= $(common_ldflags) +nq_svga_DEPENDENCIES= $(nq_svga_libs) + +# ... X11 +nq_x11_libs= \ + $(nq_client_libs) \ + $(nq_cl_plugin_LIBS) \ + libs/video/renderer/libQFrenderer.la \ + libs/models/libQFmodels.la \ + libs/video/targets/libQFx11.la \ + $(nq_client_LIBS) +nq_x11_SOURCES= nq/source/sys_unix.c +nq_x11_LDADD= $(nq_x11_libs) \ + $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \ + $(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(DL_LIBS) +nq_x11_LDFLAGS= $(common_ldflags) +nq_x11_DEPENDENCIES= $(nq_x11_libs) + +# OpenGL-using targets + +# ... SGI/Microsoft WGL (Windows OpenGL) +nq_wgl_libs= \ + $(nq_client_libs) \ + $(nq_cl_plugin_LIBS) \ + $(opengl_QFLIBS) \ + libs/video/targets/libQFwgl.la \ + $(nq_client_LIBS) +nq_wgl_SOURCES= nq/source/sys_win.c +nq_wgl_LDADD= $(nq_wgl_libs) -lgdi32 -lcomctl32 -lwinmm $(NET_LIBS) +nq_wgl_LDFLAGS= $(common_ldflags) +nq_wgl_DEPENDENCIES= $(nq_wgl_libs) + +# Dedicated Server +if SYSTYPE_WIN32 +ded_sources= nq/source/sys_wind.c nq/source/sv_ded.c +else +ded_sources= nq/source/sys_unixd.c nq/source/sv_ded.c +endif +EXTRA_DIST += nq/source/sys_wind.c nq/source/sys_unixd.c nq/source/sv_ded.c + +nq_server_LDFLAGS= $(common_ldflags) +nq_server_SOURCES= $(ded_sources) +nq_server_LDADD= $(server_libs) $(nq_server_LIBS) +nq_server_DEPENDENCIES= $(server_libs) $(nq_server_LIB_DEPS) diff --git a/nq/source/cl_chase.c b/nq/source/cl_chase.c index c492ff609..92903bbfc 100644 --- a/nq/source/cl_chase.c +++ b/nq/source/cl_chase.c @@ -42,10 +42,11 @@ #include "QF/plugin/vid_render.h" -#include "chase.h" -#include "client.h" #include "world.h" +#include "nq/include/chase.h" +#include "nq/include/client.h" + vec3_t camera_origin = {0,0,0}; vec3_t camera_angles = {0,0,0}; vec3_t player_origin = {0,0,0}; diff --git a/nq/source/cl_cmd.c b/nq/source/cl_cmd.c index fabc6e226..33689dc5e 100644 --- a/nq/source/cl_cmd.c +++ b/nq/source/cl_cmd.c @@ -40,7 +40,7 @@ #include "QF/sizebuf.h" #include "QF/sys.h" -#include "client.h" +#include "nq/include/client.h" /* diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c index 7d47eb627..55a10af26 100644 --- a/nq/source/cl_demo.c +++ b/nq/source/cl_demo.c @@ -46,9 +46,10 @@ #include "QF/sys.h" #include "QF/va.h" -#include "client.h" #include "compat.h" -#include "host.h" + +#include "nq/include/client.h" +#include "nq/include/host.h" typedef struct { int frames; diff --git a/nq/source/cl_ents.c b/nq/source/cl_ents.c index b6bac93cd..6f6e90e29 100644 --- a/nq/source/cl_ents.c +++ b/nq/source/cl_ents.c @@ -44,12 +44,13 @@ #include "QF/plugin/vid_render.h" -#include "chase.h" -#include "client.h" #include "compat.h" -#include "host.h" -#include "host.h" -#include "server.h" + +#include "nq/include/chase.h" +#include "nq/include/client.h" +#include "nq/include/host.h" +#include "nq/include/host.h" +#include "nq/include/server.h" entity_t cl_entities[MAX_EDICTS]; double cl_msgtime[MAX_EDICTS]; diff --git a/nq/source/cl_input.c b/nq/source/cl_input.c index f4d175723..dd980e814 100644 --- a/nq/source/cl_input.c +++ b/nq/source/cl_input.c @@ -44,10 +44,11 @@ #include "QF/plugin/vid_render.h" -#include "chase.h" -#include "client.h" #include "compat.h" -#include "host.h" + +#include "nq/include/chase.h" +#include "nq/include/client.h" +#include "nq/include/host.h" /* KEY BUTTONS diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c index 7f6dd9e82..e7b90a9fb 100644 --- a/nq/source/cl_main.c +++ b/nq/source/cl_main.c @@ -48,16 +48,17 @@ #include "QF/plugin/console.h" #include "QF/plugin/vid_render.h" -#include "chase.h" -#include "cl_skin.h" -#include "client.h" -#include "clview.h" #include "compat.h" -#include "host.h" -#include "host.h" -#include "server.h" +#include "clview.h" #include "sbar.h" +#include "nq/include/chase.h" +#include "nq/include/cl_skin.h" +#include "nq/include/client.h" +#include "nq/include/host.h" +#include "nq/include/host.h" +#include "nq/include/server.h" + CLIENT_PLUGIN_PROTOS static plugin_list_t client_plugin_list[] = { CLIENT_PLUGIN_LIST diff --git a/nq/source/cl_parse.c b/nq/source/cl_parse.c index ea12152ff..bf9ce6418 100644 --- a/nq/source/cl_parse.c +++ b/nq/source/cl_parse.c @@ -53,12 +53,13 @@ #include "QF/plugin/vid_render.h" -#include "client.h" #include "compat.h" -#include "host.h" #include "sbar.h" -#include "server.h" -#include "game.h" + +#include "nq/include/client.h" +#include "nq/include/host.h" +#include "nq/include/server.h" +#include "nq/include/game.h" const char *svc_strings[] = { "svc_bad", diff --git a/nq/source/cl_screen.c b/nq/source/cl_screen.c index 1a0f8e7be..c7940e305 100644 --- a/nq/source/cl_screen.c +++ b/nq/source/cl_screen.c @@ -46,9 +46,10 @@ #include "QF/plugin/vid_render.h" -#include "client.h" #include "sbar.h" +#include "nq/include/client.h" + static qpic_t *scr_net; static void diff --git a/nq/source/cl_tent.c b/nq/source/cl_tent.c index 8aa7dd2e7..89f05ee74 100644 --- a/nq/source/cl_tent.c +++ b/nq/source/cl_tent.c @@ -45,9 +45,10 @@ #include "QF/plugin/vid_render.h" -#include "client.h" #include "compat.h" +#include "nq/include/client.h" + typedef struct tent_s { struct tent_s *next; entity_t ent; diff --git a/nq/source/cl_view.c b/nq/source/cl_view.c index 6def74958..71383ff08 100644 --- a/nq/source/cl_view.c +++ b/nq/source/cl_view.c @@ -35,12 +35,13 @@ #include "QF/plugin/vid_render.h" -#include "chase.h" -#include "client.h" #include "compat.h" -#include "host.h" #include "clview.h" +#include "nq/include/chase.h" +#include "nq/include/client.h" +#include "nq/include/host.h" + /* The view is allowed to move slightly from it's true position for bobbing, but if it exceeds 8 pixels linear distance (spherical, not box), the list diff --git a/nq/source/game.c b/nq/source/game.c index f67104472..356cbb05b 100644 --- a/nq/source/game.c +++ b/nq/source/game.c @@ -35,8 +35,8 @@ #include "QF/quakefs.h" #include "QF/sys.h" -#include "game.h" -#include "server.h" +#include "nq/include/game.h" +#include "nq/include/server.h" qboolean standard_quake = false; diff --git a/nq/source/host.c b/nq/source/host.c index c08a4c093..8ee5a2859 100644 --- a/nq/source/host.c +++ b/nq/source/host.c @@ -56,11 +56,12 @@ #include "QF/plugin/vid_render.h" #include "buildnum.h" -#include "chase.h" #include "compat.h" -#include "host.h" -#include "server.h" -#include "sv_progs.h" + +#include "nq/include/chase.h" +#include "nq/include/host.h" +#include "nq/include/server.h" +#include "nq/include/sv_progs.h" /* diff --git a/nq/source/host_cmd.c b/nq/source/host_cmd.c index 31bf539b5..ce79f1212 100644 --- a/nq/source/host_cmd.c +++ b/nq/source/host_cmd.c @@ -50,13 +50,14 @@ #include "QF/sys.h" #include "QF/va.h" -#include "client.h" #include "compat.h" -#include "host.h" -#include "server.h" -#include "sv_progs.h" #include "world.h" +#include "nq/include/client.h" +#include "nq/include/host.h" +#include "nq/include/server.h" +#include "nq/include/sv_progs.h" + int current_skill; void diff --git a/nq/source/sbar.c b/nq/source/sbar.c index 44d911118..dd8c9adef 100644 --- a/nq/source/sbar.c +++ b/nq/source/sbar.c @@ -53,11 +53,12 @@ #include "QF/plugin/console.h" #include "QF/plugin/vid_render.h" -#include "client.h" #include "compat.h" -#include "game.h" #include "sbar.h" -#include "server.h" + +#include "nq/include/client.h" +#include "nq/include/game.h" +#include "nq/include/server.h" int sb_updates; // if >= vid.numpages, no update needed diff --git a/nq/source/sv_cl_phys.c b/nq/source/sv_cl_phys.c index accf26af9..1b9517ccc 100644 --- a/nq/source/sv_cl_phys.c +++ b/nq/source/sv_cl_phys.c @@ -31,11 +31,12 @@ #include "QF/cvar.h" #include "QF/sys.h" -#include "host.h" -#include "server.h" -#include "sv_progs.h" #include "world.h" +#include "nq/include/host.h" +#include "nq/include/server.h" +#include "nq/include/sv_progs.h" + #define sv_frametime host_frametime cvar_t *sv_nostep; diff --git a/nq/source/sv_cvar.c b/nq/source/sv_cvar.c index 4d9082c96..0e8e35383 100644 --- a/nq/source/sv_cvar.c +++ b/nq/source/sv_cvar.c @@ -32,7 +32,7 @@ #include "QF/cvar.h" -#include "server.h" +#include "nq/include/server.h" void Cvar_Info (cvar_t *var) diff --git a/nq/source/sv_ded.c b/nq/source/sv_ded.c index c22f9cc3a..0b0cc7d0f 100644 --- a/nq/source/sv_ded.c +++ b/nq/source/sv_ded.c @@ -36,8 +36,8 @@ #include "QF/plugin/vid_render.h" -#include "host.h" -#include "server.h" +#include "nq/include/host.h" +#include "nq/include/server.h" client_state_t cl; client_static_t cls; diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c index b666516f6..70b3d91f4 100644 --- a/nq/source/sv_main.c +++ b/nq/source/sv_main.c @@ -36,11 +36,12 @@ #include "QF/va.h" #include "compat.h" -#include "host.h" -#include "server.h" -#include "sv_progs.h" #include "world.h" +#include "nq/include/host.h" +#include "nq/include/server.h" +#include "nq/include/sv_progs.h" + server_t sv; server_static_t svs; double sv_frametime; diff --git a/nq/source/sv_move.c b/nq/source/sv_move.c index 013e4d48e..494fc7083 100644 --- a/nq/source/sv_move.c +++ b/nq/source/sv_move.c @@ -28,10 +28,11 @@ # include "config.h" #endif -#include "server.h" -#include "sv_progs.h" #include "world.h" +#include "nq/include/server.h" +#include "nq/include/sv_progs.h" + #define STEPSIZE 18 int c_yes, c_no; diff --git a/nq/source/sv_phys.c b/nq/source/sv_phys.c index 795fc0f6d..f36dcfde9 100644 --- a/nq/source/sv_phys.c +++ b/nq/source/sv_phys.c @@ -31,10 +31,11 @@ #include "QF/cvar.h" #include "QF/sys.h" -#include "server.h" -#include "sv_progs.h" #include "world.h" +#include "nq/include/server.h" +#include "nq/include/sv_progs.h" + /* pushmove objects do not obey gravity, and do not interact with each other or trigger fields, but block normal movement and push normal diff --git a/nq/source/sv_pr_cmds.c b/nq/source/sv_pr_cmds.c index d6982bc3a..d5dcc4bb4 100644 --- a/nq/source/sv_pr_cmds.c +++ b/nq/source/sv_pr_cmds.c @@ -46,11 +46,12 @@ #include "QF/va.h" #include "compat.h" -#include "host.h" -#include "server.h" -#include "sv_progs.h" #include "world.h" +#include "nq/include/host.h" +#include "nq/include/server.h" +#include "nq/include/sv_progs.h" + /* BUILT-IN FUNCTIONS */ diff --git a/nq/source/sv_progs.c b/nq/source/sv_progs.c index 8626ade59..baf8ad0a3 100644 --- a/nq/source/sv_progs.c +++ b/nq/source/sv_progs.c @@ -41,11 +41,12 @@ #include "QF/sys.h" #include "compat.h" -#include "host.h" -#include "server.h" -#include "sv_progs.h" #include "world.h" +#include "nq/include/host.h" +#include "nq/include/server.h" +#include "nq/include/sv_progs.h" + progs_t sv_pr_state; sv_globals_t sv_globals; sv_funcs_t sv_funcs; diff --git a/nq/source/sv_user.c b/nq/source/sv_user.c index c1db350a8..95bd01ac9 100644 --- a/nq/source/sv_user.c +++ b/nq/source/sv_user.c @@ -42,11 +42,12 @@ #include "QF/msg.h" #include "QF/sys.h" -#include "host.h" -#include "server.h" -#include "sv_progs.h" #include "world.h" +#include "nq/include/host.h" +#include "nq/include/server.h" +#include "nq/include/sv_progs.h" + cvar_t *sv_rollangle; cvar_t *sv_rollspeed; diff --git a/nq/source/sys_sdl.c b/nq/source/sys_sdl.c index 37ff959aa..ddc4a8df7 100644 --- a/nq/source/sys_sdl.c +++ b/nq/source/sys_sdl.c @@ -51,11 +51,11 @@ #include "QF/qargs.h" #include "QF/sys.h" -#include "client.h" -#include "host.h" +#include "nq/include/client.h" +#include "nq/include/host.h" #ifdef _WIN32 -# include "winquake.h" +# include "nq/include/winquake.h" #endif int qf_sdl_link; diff --git a/nq/source/sys_unix.c b/nq/source/sys_unix.c index 2803d31f6..20cce79a5 100644 --- a/nq/source/sys_unix.c +++ b/nq/source/sys_unix.c @@ -49,8 +49,8 @@ #include "QF/qargs.h" #include "QF/sys.h" -#include "client.h" -#include "host.h" +#include "nq/include/client.h" +#include "nq/include/host.h" qboolean isDedicated = false; diff --git a/nq/source/sys_unixd.c b/nq/source/sys_unixd.c index f9ff4ca74..18e45a8ad 100644 --- a/nq/source/sys_unixd.c +++ b/nq/source/sys_unixd.c @@ -48,7 +48,7 @@ #include "QF/qargs.h" #include "QF/sys.h" -#include "host.h" +#include "nq/include/host.h" qboolean isDedicated = true; diff --git a/nq/source/sys_win.c b/nq/source/sys_win.c index e4593ffd0..ee040f956 100644 --- a/nq/source/sys_win.c +++ b/nq/source/sys_win.c @@ -36,8 +36,8 @@ #include "QF/screen.h" #include "QF/sys.h" -#include "client.h" -#include "host.h" +#include "nq/include/client.h" +#include "nq/include/host.h" qboolean isDedicated = false; diff --git a/nq/source/sys_wind.c b/nq/source/sys_wind.c index b0555ec43..69393dfd6 100644 --- a/nq/source/sys_wind.c +++ b/nq/source/sys_wind.c @@ -34,7 +34,7 @@ #include "QF/qargs.h" #include "QF/sys.h" -#include "host.h" +#include "nq/include/host.h" qboolean isDedicated = true; diff --git a/nq/source/world.c b/nq/source/world.c index 6d404f39c..f7d379a2d 100644 --- a/nq/source/world.c +++ b/nq/source/world.c @@ -43,10 +43,11 @@ #include "QF/sys.h" #include "compat.h" -#include "server.h" -#include "sv_progs.h" #include "world.h" +#include "nq/include/server.h" +#include "nq/include/sv_progs.h" + #define always_inline inline __attribute__((__always_inline__)) #define EDICT_LEAFS 32 diff --git a/pkg-config/Makefile.am b/pkg-config/Makefile.am deleted file mode 100644 index 48f4005f1..000000000 --- a/pkg-config/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -pkgdatadir=@libdir@/pkgconfig - -pkgdata_DATA=quakeforge.pc qfcc.pc - -EXTRA_DIST=quakeforge.pc.in qfcc.pc.in diff --git a/pkg-config/Makemodule.am b/pkg-config/Makemodule.am new file mode 100644 index 000000000..dca513fae --- /dev/null +++ b/pkg-config/Makemodule.am @@ -0,0 +1,5 @@ +pkgconfigdir = @libdir@/pkgconfig + +pkgconfig_DATA = pkg-config/quakeforge.pc pkg-config/qfcc.pc + +EXTRA_DIST += pkg-config/quakeforge.pc.in pkg-config/qfcc.pc.in diff --git a/qtv/Makefile.am b/qtv/Makefile.am deleted file mode 100644 index 77e3cbf5b..000000000 --- a/qtv/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= include source diff --git a/qtv/Makemodule.am b/qtv/Makemodule.am new file mode 100644 index 000000000..562039b04 --- /dev/null +++ b/qtv/Makemodule.am @@ -0,0 +1,2 @@ +include qtv/include/Makemodule.am +include qtv/source/Makemodule.am diff --git a/qtv/include/Makefile.am b/qtv/include/Makefile.am deleted file mode 100644 index 19df055f3..000000000 --- a/qtv/include/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign - -EXTRA_DIST = client.h connection.h qtv.h server.h diff --git a/qtv/include/Makemodule.am b/qtv/include/Makemodule.am new file mode 100644 index 000000000..346c1716d --- /dev/null +++ b/qtv/include/Makemodule.am @@ -0,0 +1,5 @@ +EXTRA_DIST += \ + qtv/include/client.h \ + qtv/include/connection.h \ + qtv/include/qtv.h \ + qtv/include/server.h diff --git a/qtv/source/Makefile.am b/qtv/source/Makemodule.am similarity index 61% rename from qtv/source/Makefile.am rename to qtv/source/Makemodule.am index fa73f8de8..3560edecf 100644 --- a/qtv/source/Makefile.am +++ b/qtv/source/Makemodule.am @@ -27,27 +27,18 @@ # $Id$ # -AUTOMAKE_OPTIONS= foreign +bin_PROGRAMS += @QTV_TARGETS@ -AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/qtv/include - -bin_PROGRAMS= @QTV_TARGETS@ - -EXTRA_PROGRAMS= qtv - -common_ldflags= -export-dynamic +EXTRA_PROGRAMS += qtv-server qtv_LIBS= \ @server_static_plugin_libs@ \ - $(top_builddir)/libs/qw/libqw.a \ - $(top_builddir)/libs/net/libnet_chan.la \ - $(top_builddir)/libs/console/libQFconsole.la \ - $(top_builddir)/libs/util/libQFutil.la + libs/qw/libqw.a \ + libs/net/libnet_chan.la \ + libs/console/libQFconsole.la \ + libs/util/libQFutil.la -qtv_SOURCES= client.c connection.c qtv.c sbar.c server.c sv_parse.c -qtv_LDADD= $(qtv_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS) -qtv_LDFLAGS= $(common_ldflags) -qtv_DEPENDENCIES= $(qtv_LIBS) - -# Kill the temp files, hopefully. -CLEANFILES = *.i *.s +qtv_server_SOURCES= qtv/source/client.c qtv/source/connection.c qtv/source/qtv.c qtv/source/sbar.c qtv/source/server.c qtv/source/sv_parse.c +qtv_server_LDADD= $(qtv_LIBS) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS) +qtv_server_LDFLAGS= $(common_ldflags) +qtv_server_DEPENDENCIES= $(qtv_LIBS) diff --git a/qtv/source/client.c b/qtv/source/client.c index 24b0e23b2..06955b12f 100644 --- a/qtv/source/client.c +++ b/qtv/source/client.c @@ -55,10 +55,10 @@ #include "qw/msg_ucmd.h" #include "qw/protocol.h" -#include "client.h" -#include "connection.h" -#include "qtv.h" -#include "server.h" +#include "qtv/include/client.h" +#include "qtv/include/connection.h" +#include "qtv/include/qtv.h" +#include "qtv/include/server.h" int client_count; static client_t *clients; diff --git a/qtv/source/connection.c b/qtv/source/connection.c index 52f159060..e670880f3 100644 --- a/qtv/source/connection.c +++ b/qtv/source/connection.c @@ -46,7 +46,7 @@ #include "QF/hash.h" #include "QF/sys.h" -#include "connection.h" +#include "qtv/include/connection.h" static hashtab_t *connections; diff --git a/qtv/source/qtv.c b/qtv/source/qtv.c index 1274254d5..a44fdf45d 100644 --- a/qtv/source/qtv.c +++ b/qtv/source/qtv.c @@ -56,14 +56,15 @@ #include "QF/plugin/console.h" +#include "compat.h" +#include "netchan.h" + #include "qw/protocol.h" -#include "client.h" -#include "compat.h" -#include "connection.h" -#include "netchan.h" -#include "qtv.h" -#include "server.h" +#include "qtv/include/client.h" +#include "qtv/include/connection.h" +#include "qtv/include/qtv.h" +#include "qtv/include/server.h" #undef qtv_print diff --git a/qtv/source/sbar.c b/qtv/source/sbar.c index 73015d00a..092c85ea1 100644 --- a/qtv/source/sbar.c +++ b/qtv/source/sbar.c @@ -37,10 +37,11 @@ #include "QF/plugin/console.h" -#include "client.h" -#include "server.h" #include "sv_console.h" -#include "qtv.h" + +#include "qtv/include/client.h" +#include "qtv/include/server.h" +#include "qtv/include/qtv.h" static void draw_clients (view_t *view) diff --git a/qtv/source/server.c b/qtv/source/server.c index 855bc492c..c376905d2 100644 --- a/qtv/source/server.c +++ b/qtv/source/server.c @@ -54,10 +54,10 @@ #include "qw/protocol.h" -#include "client.h" -#include "connection.h" -#include "qtv.h" -#include "server.h" +#include "qtv/include/client.h" +#include "qtv/include/connection.h" +#include "qtv/include/qtv.h" +#include "qtv/include/server.h" int server_count; static hashtab_t *server_hash; diff --git a/qtv/source/sv_parse.c b/qtv/source/sv_parse.c index 48198e809..c179d125e 100644 --- a/qtv/source/sv_parse.c +++ b/qtv/source/sv_parse.c @@ -56,10 +56,10 @@ #include "qw/msg_ucmd.h" #include "qw/protocol.h" -#include "client.h" -#include "connection.h" -#include "qtv.h" -#include "server.h" +#include "qtv/include/client.h" +#include "qtv/include/connection.h" +#include "qtv/include/qtv.h" +#include "qtv/include/server.h" static void sv_serverdata (server_t *sv, qmsg_t *msg) diff --git a/qw/Makefile.am b/qw/Makefile.am deleted file mode 100644 index 77e3cbf5b..000000000 --- a/qw/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= include source diff --git a/qw/Makemodule.am b/qw/Makemodule.am new file mode 100644 index 000000000..9fca70d9b --- /dev/null +++ b/qw/Makemodule.am @@ -0,0 +1,2 @@ +include qw/include/Makemodule.am +include qw/source/Makemodule.am diff --git a/qw/include/Makefile.am b/qw/include/Makefile.am deleted file mode 100644 index 67535b195..000000000 --- a/qw/include/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign - -EXTRA_DIST = \ - chase.h cl_cam.h cl_chat.h cl_demo.h cl_ents.h cl_http.h cl_input.h \ - cl_main.h cl_parse.h cl_pred.h cl_skin.h cl_slist.h cl_tent.h \ - client.h crudefile.h game.h host.h map_cfg.h server.h sv_gib.h \ - sv_demo.h sv_pr_cmds.h sv_pr_cpqw.h sv_pr_qwe.h sv_progs.h sv_qtv.h \ - sv_recorder.h diff --git a/qw/include/Makemodule.am b/qw/include/Makemodule.am new file mode 100644 index 000000000..2f5076b12 --- /dev/null +++ b/qw/include/Makemodule.am @@ -0,0 +1,28 @@ +EXTRA_DIST += \ + qw/include/chase.h \ + qw/include/cl_cam.h \ + qw/include/cl_chat.h \ + qw/include/cl_demo.h \ + qw/include/cl_ents.h \ + qw/include/cl_http.h \ + qw/include/cl_input.h \ + qw/include/cl_main.h \ + qw/include/cl_parse.h \ + qw/include/cl_pred.h \ + qw/include/cl_skin.h \ + qw/include/cl_slist.h \ + qw/include/cl_tent.h \ + qw/include/client.h \ + qw/include/crudefile.h \ + qw/include/game.h \ + qw/include/host.h \ + qw/include/map_cfg.h \ + qw/include/server.h \ + qw/include/sv_gib.h \ + qw/include/sv_demo.h \ + qw/include/sv_pr_cmds.h \ + qw/include/sv_pr_cpqw.h \ + qw/include/sv_pr_qwe.h \ + qw/include/sv_progs.h \ + qw/include/sv_qtv.h \ + qw/include/sv_recorder.h diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am deleted file mode 100644 index 9afe77ae1..000000000 --- a/qw/source/Makefile.am +++ /dev/null @@ -1,191 +0,0 @@ -## Process this file with automake to produce Makefile.in -# -# Makefile.am -# -# Automake-using build system for QuakeForge -# -# Copyright (C) 2000 Jeff Teunissen -# -# This Makefile is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to: -# -# Free Software Foundation, Inc. -# 59 Temple Place - Suite 330 -# Boston, MA 02111-1307, USA -# -# $Id$ -# - -AUTOMAKE_OPTIONS= foreign - -# Stuff that is common to both client and server -AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/qw/include @LIBCURL_CFLAGS@ -SDL_LIBS = @SDL_LIBS@ -AM_CFLAGS= @PTHREAD_CFLAGS@ - -bin_PROGRAMS= @QW_TARGETS@ - -EXTRA_PROGRAMS= \ - qw-client-fbdev qw-client-sdl qw-client-svga qw-client-wgl qw-client-x11 \ - qw-server qw-master - -noinst_LIBRARIES= @qw_libs@ -EXTRA_LIBRARIES=libqw_client.a libqw_common.a libqw_sdl.a libqw_server.a - - -libqw_common_a_SOURCES=\ - game.c map_cfg.c pmove.c pmovetst.c net_packetlog.c -libqw_sdl_a_SOURCES=cl_sys_sdl.c -libqw_sdl_a_CFLAGS=$(SDL_CFLAGS) - -common_ldflags= -export-dynamic @PTHREAD_LDFLAGS@ - -# Server builds -# -# ... System type -if SYSTYPE_WIN32 -syssv_SRC= sv_sys_win.c -else -syssv_SRC= sv_sys_unix.c -endif - -EXTRA_DIST=sv_sys_win.c sv_sys_unix.c - -libqw_server_a_SOURCES= \ - crudefile.c sv_ccmds.c sv_demo.c sv_ents.c sv_gib.c sv_init.c sv_main.c \ - sv_move.c sv_phys.c sv_pr_cmds.c sv_pr_cpqw.c sv_pr_qwe.c sv_progs.c \ - sv_qtv.c sv_recorder.c sv_sbar.c sv_send.c sv_user.c world.c - -qw_server_LIBS= \ - @server_static_plugin_libs@ \ - $(top_builddir)/libs/qw/libqw.a \ - $(top_builddir)/libs/net/libnet_chan.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/gib/libQFgib.la \ - $(top_builddir)/libs/ruamoko/libQFruamoko.la \ - $(top_builddir)/libs/console/libQFconsole.la \ - $(top_builddir)/libs/util/libQFutil.la - -qw_server_deps=libqw_server.a libqw_common.a $(qw_server_LIBS) -qw_server_SOURCES= $(syssv_SRC) -qw_server_LDADD= $(qw_server_deps) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS) -qw_server_LDFLAGS= $(common_ldflags) -qw_server_DEPENDENCIES= $(qw_server_deps) - -qw_master_deps=$(top_builddir)/libs/util/libQFutil.la -qw_master_SOURCES= master.c -qw_master_LDADD= $(qw_master_deps) $(NET_LIBS) -qw_master_DEPENDENCIES= $(qw_master_deps) -qw_master_LDFLAGS= $(common_ldflags) - -cl_plugin_LIBS= \ - @client_static_plugin_libs@ - -qw_client_LIBS= \ - $(top_builddir)/libs/qw/libqw.a \ - $(top_builddir)/libs/net/libnet_chan.la \ - $(top_builddir)/libs/console/libQFconsole.la \ - $(top_builddir)/libs/video/targets/libQFjs.la \ - $(top_builddir)/libs/audio/libQFcd.la \ - $(top_builddir)/libs/audio/libQFsound.la \ - $(top_builddir)/libs/image/libQFimage.la \ - $(top_builddir)/libs/gib/libQFgib.la \ - $(top_builddir)/libs/ruamoko/libQFruamoko.la \ - $(top_builddir)/libs/util/libQFutil.la - -client_LIBS= $(qw_client_LIBS) -client_libs= libqw_client.a libqw_common.a \ - $(top_builddir)/libs/client/libQFclient.la - -libqw_client_a_SOURCES= \ - cl_cam.c cl_chase.c cl_chat.c cl_cmd.c cl_cvar.c cl_demo.c \ - cl_entparse.c cl_ents.c cl_http.c cl_input.c cl_main.c cl_ngraph.c \ - cl_parse.c cl_pred.c cl_rss.c cl_screen.c cl_skin.c cl_slist.c \ - cl_tent.c cl_view.c \ - locs.c sbar.c teamplay.c - -# Software-rendering clients - -# ... Linux FBDev -qw_client_fbdev_libs= \ - $(client_libs) \ - $(cl_plugin_LIBS) \ - $(top_builddir)/libs/video/renderer/libQFrenderer.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/video/targets/libQFfbdev.la \ - $(client_LIBS) -qw_client_fbdev_SOURCES= cl_sys_unix.c -qw_client_fbdev_LDADD= $(qw_client_fbdev_libs) $(NET_LIBS) $(LIBCURL_LIBS) -qw_client_fbdev_LDFLAGS= $(common_ldflags) -qw_client_fbdev_DEPENDENCIES= $(qw_client_fbdev_libs) - -# ... Simple DirectMedia Layer, version 1.2 and higher -qw_client_sdl_libs= \ - libqw_sdl.a \ - $(client_libs) \ - $(cl_plugin_LIBS) \ - $(top_builddir)/libs/video/renderer/libQFrenderer.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/video/targets/libQFsdl.la \ - $(client_LIBS) -qw_client_sdl_SOURCES=sdl_link.c -qw_client_sdl_LDADD= libqw_sdl.a $(qw_client_sdl_libs) $(SDL_LIBS) $(NET_LIBS) $(LIBCURL_LIBS) -qw_client_sdl_LDFLAGS= $(common_ldflags) -qw_client_sdl_DEPENDENCIES= libqw_sdl.a $(qw_client_sdl_libs) - -# ... Linux SVGAlib -qw_client_svga_libs= \ - $(client_libs) \ - $(cl_plugin_LIBS) \ - $(top_builddir)/libs/video/renderer/libQFrenderer.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/video/targets/libQFsvga.la \ - $(client_LIBS) -qw_client_svga_SOURCES= cl_sys_unix.c -qw_client_svga_LDADD= $(qw_client_svga_libs) $(SVGA_LIBS) $(NET_LIBS) $(LIBCURL_LIBS) -qw_client_svga_LDFLAGS= $(common_ldflags) -qw_client_svga_DEPENDENCIES= $(qw_client_svga_libs) - -# ... X11 -qw_client_x11_libs= \ - $(client_libs) \ - $(cl_plugin_LIBS) \ - $(top_builddir)/libs/video/renderer/libQFrenderer.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/video/targets/libQFx11.la \ - $(client_LIBS) -qw_client_x11_SOURCES= cl_sys_unix.c -qw_client_x11_LDADD= $(qw_client_x11_libs) \ - $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \ - $(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS) $(DL_LIBS) -qw_client_x11_LDFLAGS= $(common_ldflags) -qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs) - -# ... SGI/Microsoft WGL (Windows OpenGL) -qw_client_wgl_libs= \ - $(client_libs) \ - $(cl_plugin_LIBS) \ - $(opengl_LIBS) \ - $(top_builddir)/libs/video/targets/libQFwgl.la \ - $(client_LIBS) -qw_client_wgl_SOURCES= cl_sys_win.c -qw_client_wgl_LDADD= $(qw_client_wgl_libs) -lgdi32 -lwinmm $(NET_LIBS) $(LIBCURL_LIBS) -qw_client_wgl_LDFLAGS= $(common_ldflags) -qw_client_wgl_DEPENDENCIES= $(qw_client_wgl_libs) - -# Stuff that doesn't get linked into an executable NEEDS to be mentioned here, -# or it won't be distributed with 'make dist' - -# Kill the temp files, hopefully. -CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES) diff --git a/qw/source/Makemodule.am b/qw/source/Makemodule.am new file mode 100644 index 000000000..553a32f65 --- /dev/null +++ b/qw/source/Makemodule.am @@ -0,0 +1,175 @@ +## Process this file with automake to produce Makefile.in +# +# Makefile.am +# +# Automake-using build system for QuakeForge +# +# Copyright (C) 2000 Jeff Teunissen +# +# This Makefile is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to: +# +# Free Software Foundation, Inc. +# 59 Temple Place - Suite 330 +# Boston, MA 02111-1307, USA +# +# $Id$ +# + +bin_PROGRAMS += @QW_TARGETS@ + +EXTRA_PROGRAMS += \ + qw-client-fbdev qw-client-sdl qw-client-svga qw-client-wgl qw-client-x11 \ + qw-server qw-master + +noinst_LIBRARIES += @qw_libs@ +EXTRA_LIBRARIES += qw/source/libqw_client.a qw/source/libqw_common.a qw/source/libqw_sdl.a qw/source/libqw_server.a + + +qw_source_libqw_common_a_SOURCES=\ + qw/source/game.c qw/source/map_cfg.c qw/source/pmove.c qw/source/pmovetst.c qw/source/net_packetlog.c +qw_source_libqw_sdl_a_SOURCES=qw/source/cl_sys_sdl.c +qw_source_libqw_sdl_a_CFLAGS=$(SDL_CFLAGS) + +# Server builds +# +# ... System type +if SYSTYPE_WIN32 +syssv_SRC= qw/source/sv_sys_win.c +else +syssv_SRC= qw/source/sv_sys_unix.c +endif + +EXTRA_DIST+=qw/source/sv_sys_win.c qw/source/sv_sys_unix.c + +qw_source_libqw_server_a_SOURCES= \ + qw/source/crudefile.c qw/source/sv_ccmds.c qw/source/sv_demo.c qw/source/sv_ents.c qw/source/sv_gib.c qw/source/sv_init.c qw/source/sv_main.c \ + qw/source/sv_move.c qw/source/sv_phys.c qw/source/sv_pr_cmds.c qw/source/sv_pr_cpqw.c qw/source/sv_pr_qwe.c qw/source/sv_progs.c \ + qw/source/sv_qtv.c qw/source/sv_recorder.c qw/source/sv_sbar.c qw/source/sv_send.c qw/source/sv_user.c qw/source/world.c + +qw_server_LIBS= \ + @server_static_plugin_libs@ \ + libs/qw/libqw.a \ + libs/net/libnet_chan.la \ + libs/models/libQFmodels.la \ + libs/gib/libQFgib.la \ + libs/ruamoko/libQFruamoko.la \ + libs/gamecode/libQFgamecode.la \ + libs/console/libQFconsole.la \ + libs/util/libQFutil.la + +qw_server_deps=qw/source/libqw_server.a qw/source/libqw_common.a $(qw_server_LIBS) +qw_server_SOURCES= $(syssv_SRC) +qw_server_LDADD= $(qw_server_deps) $(NET_LIBS) $(DL_LIBS) $(CURSES_LIBS) +qw_server_LDFLAGS= $(common_ldflags) +qw_server_DEPENDENCIES= $(qw_server_deps) + +qw_master_deps=libs/util/libQFutil.la +qw_master_SOURCES= qw/source/master.c +qw_master_LDADD= $(qw_master_deps) $(NET_LIBS) +qw_master_DEPENDENCIES= $(qw_master_deps) +qw_master_LDFLAGS= $(common_ldflags) + +qw_cl_plugin_LIBS= \ + @client_static_plugin_libs@ + +qw_client_LIBS= \ + libs/qw/libqw.a \ + libs/net/libnet_chan.la \ + libs/console/libQFconsole.la \ + libs/video/targets/libQFjs.la \ + libs/audio/libQFcd.la \ + libs/audio/libQFsound.la \ + libs/image/libQFimage.la \ + libs/gib/libQFgib.la \ + libs/ruamoko/libQFruamoko.la \ + libs/util/libQFutil.la +qw_client_libs= qw/source/libqw_client.a qw/source/libqw_common.a \ + libs/client/libQFclient.la + +qw_source_libqw_client_a_SOURCES= \ + qw/source/cl_cam.c qw/source/cl_chase.c qw/source/cl_chat.c qw/source/cl_cmd.c qw/source/cl_cvar.c qw/source/cl_demo.c \ + qw/source/cl_entparse.c qw/source/cl_ents.c qw/source/cl_http.c qw/source/cl_input.c qw/source/cl_main.c qw/source/cl_ngraph.c \ + qw/source/cl_parse.c qw/source/cl_pred.c qw/source/cl_rss.c qw/source/cl_screen.c qw/source/cl_skin.c qw/source/cl_slist.c \ + qw/source/cl_tent.c qw/source/cl_view.c \ + qw/source/locs.c qw/source/sbar.c qw/source/teamplay.c + +# Software-rendering clients + +# ... Linux FBDev +qw_client_fbdev_libs= \ + $(qw_client_libs) \ + $(qw_cl_plugin_LIBS) \ + libs/video/renderer/libQFrenderer.la \ + libs/models/libQFmodels.la \ + libs/video/targets/libQFfbdev.la \ + $(qw_client_LIBS) +qw_client_fbdev_SOURCES= qw/source/cl_sys_unix.c +qw_client_fbdev_LDADD= $(qw_client_fbdev_libs) $(NET_LIBS) $(LIBCURL_LIBS) +qw_client_fbdev_LDFLAGS= $(common_ldflags) +qw_client_fbdev_DEPENDENCIES= $(qw_client_fbdev_libs) + +# ... Simple DirectMedia Layer, version 1.2 and higher +qw_client_sdl_libs= \ + qw/source/libqw_sdl.a \ + $(qw_client_libs) \ + $(qw_cl_plugin_LIBS) \ + libs/video/renderer/libQFrenderer.la \ + libs/models/libQFmodels.la \ + libs/video/targets/libQFsdl.la \ + $(qw_client_LIBS) +qw_client_sdl_SOURCES=qw/source/sdl_link.c +qw_client_sdl_LDADD= qw/source/libqw_sdl.a $(qw_client_sdl_libs) $(SDL_LIBS) $(NET_LIBS) $(LIBCURL_LIBS) +qw_client_sdl_LDFLAGS= $(common_ldflags) +qw_client_sdl_DEPENDENCIES= qw/source/libqw_sdl.a $(qw_client_sdl_libs) + +# ... Linux SVGAlib +qw_client_svga_libs= \ + $(qw_client_libs) \ + $(qw_cl_plugin_LIBS) \ + libs/video/renderer/libQFrenderer.la \ + libs/models/libQFmodels.la \ + libs/video/targets/libQFsvga.la \ + $(qw_client_LIBS) +qw_client_svga_SOURCES= qw/source/cl_sys_unix.c +qw_client_svga_LDADD= $(qw_client_svga_libs) $(SVGA_LIBS) $(NET_LIBS) $(LIBCURL_LIBS) +qw_client_svga_LDFLAGS= $(common_ldflags) +qw_client_svga_DEPENDENCIES= $(qw_client_svga_libs) + +# ... X11 +qw_client_x11_libs= \ + $(qw_client_libs) \ + $(qw_cl_plugin_LIBS) \ + libs/video/renderer/libQFrenderer.la \ + libs/models/libQFmodels.la \ + libs/video/targets/libQFx11.la \ + $(qw_client_LIBS) +qw_client_x11_SOURCES= qw/source/cl_sys_unix.c +qw_client_x11_LDADD= $(qw_client_x11_libs) \ + $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \ + $(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS) $(DL_LIBS) +qw_client_x11_LDFLAGS= $(common_ldflags) +qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs) + +# ... SGI/Microsoft WGL (Windows OpenGL) +qw_client_wgl_libs= \ + $(qw_client_libs) \ + $(qw_cl_plugin_LIBS) \ + $(opengl_LIBS) \ + libs/video/targets/libQFwgl.la \ + $(qw_client_LIBS) +qw_client_wgl_SOURCES= qw/source/cl_sys_win.c +qw_client_wgl_LDADD= $(qw_client_wgl_libs) -lgdi32 -lwinmm $(NET_LIBS) $(LIBCURL_LIBS) +qw_client_wgl_LDFLAGS= $(common_ldflags) +qw_client_wgl_DEPENDENCIES= $(qw_client_wgl_libs) diff --git a/qw/source/cl_cam.c b/qw/source/cl_cam.c index f7e9adf44..5a7f0d486 100644 --- a/qw/source/cl_cam.c +++ b/qw/source/cl_cam.c @@ -45,14 +45,15 @@ #include "QF/cvar.h" #include "QF/msg.h" -#include "chase.h" -#include "cl_cam.h" -#include "cl_input.h" -#include "client.h" #include "compat.h" -#include "qw/pmove.h" #include "sbar.h" +#include "qw/include/chase.h" +#include "qw/include/cl_cam.h" +#include "qw/include/cl_input.h" +#include "qw/include/client.h" +#include "qw/pmove.h" + #define PM_SPECTATORMAXSPEED 500 #define PM_STOPSPEED 100 #define PM_MAXSPEED 320 diff --git a/qw/source/cl_chase.c b/qw/source/cl_chase.c index 26f5b02b4..2e5583429 100644 --- a/qw/source/cl_chase.c +++ b/qw/source/cl_chase.c @@ -42,9 +42,9 @@ #include "QF/plugin/vid_render.h" -#include "chase.h" -#include "cl_input.h" -#include "client.h" +#include "qw/include/chase.h" +#include "qw/include/cl_input.h" +#include "qw/include/client.h" #include "world.h" vec3_t camera_origin = {0,0,0}; diff --git a/qw/source/cl_chat.c b/qw/source/cl_chat.c index 2b40e64dd..7a3dcb186 100644 --- a/qw/source/cl_chat.c +++ b/qw/source/cl_chat.c @@ -44,8 +44,8 @@ #include "QF/sys.h" #include "QF/va.h" -#include "client.h" -#include "cl_chat.h" +#include "qw/include/client.h" +#include "qw/include/cl_chat.h" llist_t *ignore_list, *dead_ignore_list; diff --git a/qw/source/cl_cmd.c b/qw/source/cl_cmd.c index a38dbc875..3b0f7b072 100644 --- a/qw/source/cl_cmd.c +++ b/qw/source/cl_cmd.c @@ -42,7 +42,7 @@ #include "QF/sys.h" #include "QF/teamplay.h" -#include "client.h" +#include "qw/include/client.h" static void send_say (const char *str) diff --git a/qw/source/cl_cvar.c b/qw/source/cl_cvar.c index c92322c7c..ebd569ba8 100644 --- a/qw/source/cl_cvar.c +++ b/qw/source/cl_cvar.c @@ -39,9 +39,10 @@ #include "QF/msg.h" #include "QF/va.h" -#include "client.h" #include "compat.h" +#include "qw/include/client.h" + void Cvar_Info (cvar_t *var) { diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c index 04ccbdf55..51c709adc 100644 --- a/qw/source/cl_demo.c +++ b/qw/source/cl_demo.c @@ -54,13 +54,14 @@ #include "QF/sys.h" #include "QF/va.h" -#include "cl_cam.h" -#include "cl_demo.h" -#include "cl_ents.h" -#include "cl_main.h" -#include "client.h" #include "compat.h" -#include "host.h" + +#include "qw/include/cl_cam.h" +#include "qw/include/cl_demo.h" +#include "qw/include/cl_ents.h" +#include "qw/include/cl_main.h" +#include "qw/include/client.h" +#include "qw/include/host.h" #include "qw/pmove.h" typedef struct { diff --git a/qw/source/cl_entparse.c b/qw/source/cl_entparse.c index ffad98174..3fdeda901 100644 --- a/qw/source/cl_entparse.c +++ b/qw/source/cl_entparse.c @@ -42,21 +42,21 @@ #include "QF/skin.h" #include "QF/sys.h" -#include "qw/msg_ucmd.h" - -#include "qw/bothdefs.h" -#include "cl_cam.h" -#include "cl_ents.h" -#include "cl_main.h" -#include "cl_parse.h" -#include "cl_pred.h" -#include "cl_tent.h" #include "compat.h" -#include "d_iface.h" -#include "host.h" -#include "qw/pmove.h" #include "clview.h" +#include "qw/msg_ucmd.h" +#include "qw/pmove.h" +#include "qw/bothdefs.h" + +#include "qw/include/cl_cam.h" +#include "qw/include/cl_ents.h" +#include "qw/include/cl_main.h" +#include "qw/include/cl_parse.h" +#include "qw/include/cl_pred.h" +#include "qw/include/cl_tent.h" +#include "qw/include/host.h" + static struct predicted_player { int flags; qboolean active; diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c index edd048090..24f14933b 100644 --- a/qw/source/cl_ents.c +++ b/qw/source/cl_ents.c @@ -42,21 +42,22 @@ #include "QF/skin.h" #include "QF/sys.h" -#include "qw/msg_ucmd.h" +#include "compat.h" +#include "clview.h" +#include "d_iface.h" #include "qw/bothdefs.h" -#include "chase.h" -#include "cl_cam.h" -#include "cl_ents.h" -#include "cl_main.h" -#include "cl_parse.h" -#include "cl_pred.h" -#include "cl_tent.h" -#include "compat.h" -#include "d_iface.h" -#include "host.h" +#include "qw/msg_ucmd.h" #include "qw/pmove.h" -#include "clview.h" + +#include "qw/include/chase.h" +#include "qw/include/cl_cam.h" +#include "qw/include/cl_ents.h" +#include "qw/include/cl_main.h" +#include "qw/include/cl_parse.h" +#include "qw/include/cl_pred.h" +#include "qw/include/cl_tent.h" +#include "qw/include/host.h" entity_t cl_player_ents[MAX_CLIENTS]; entity_t cl_flag_ents[MAX_CLIENTS]; diff --git a/qw/source/cl_http.c b/qw/source/cl_http.c index 38bd9f204..b13986cf2 100644 --- a/qw/source/cl_http.c +++ b/qw/source/cl_http.c @@ -38,9 +38,9 @@ #include "QF/dstring.h" #include "QF/sys.h" -#include "cl_http.h" -#include "cl_parse.h" -#include "client.h" +#include "qw/include/cl_http.h" +#include "qw/include/cl_parse.h" +#include "qw/include/client.h" static int curl_borked; static CURL *easy_handle; @@ -129,7 +129,7 @@ CL_HTTP_Reset (void) #else -#include "cl_http.h" +#include "qw/include/cl_http.h" void CL_HTTP_Init (void) {} void CL_HTTP_Shutdown (void) {} diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c index e80ea4714..55ef38f5d 100644 --- a/qw/source/cl_input.c +++ b/qw/source/cl_input.c @@ -45,17 +45,18 @@ #include "QF/teamplay.h" #include "QF/va.h" +#include "compat.h" +#include "clview.h" + #include "qw/msg_ucmd.h" -#include "chase.h" -#include "cl_cam.h" -#include "cl_demo.h" -#include "cl_input.h" -#include "cl_parse.h" -#include "client.h" -#include "compat.h" -#include "host.h" -#include "clview.h" +#include "qw/include/chase.h" +#include "qw/include/cl_cam.h" +#include "qw/include/cl_demo.h" +#include "qw/include/cl_input.h" +#include "qw/include/cl_parse.h" +#include "qw/include/client.h" +#include "qw/include/host.h" cvar_t *cl_nodelta; cvar_t *cl_maxnetfps; diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c index b78038ca9..08754ffc2 100644 --- a/qw/source/cl_main.c +++ b/qw/source/cl_main.c @@ -91,28 +91,30 @@ #include "QF/plugin/console.h" -#include "qw/bothdefs.h" #include "buildnum.h" -#include "cl_cam.h" -#include "cl_chat.h" -#include "cl_demo.h" -#include "cl_ents.h" -#include "cl_http.h" -#include "cl_input.h" -#include "cl_main.h" -#include "cl_parse.h" -#include "cl_pred.h" -#include "cl_skin.h" -#include "cl_slist.h" -#include "cl_tent.h" -#include "client.h" -#include "compat.h" -#include "game.h" -#include "host.h" -#include "netchan.h" -#include "qw/pmove.h" -#include "sbar.h" #include "clview.h" +#include "compat.h" +#include "sbar.h" + +#include "qw/bothdefs.h" +#include "qw/pmove.h" + +#include "qw/include/cl_cam.h" +#include "qw/include/cl_chat.h" +#include "qw/include/cl_demo.h" +#include "qw/include/cl_ents.h" +#include "qw/include/cl_http.h" +#include "qw/include/cl_input.h" +#include "qw/include/cl_main.h" +#include "qw/include/cl_parse.h" +#include "qw/include/cl_pred.h" +#include "qw/include/cl_skin.h" +#include "qw/include/cl_slist.h" +#include "qw/include/cl_tent.h" +#include "qw/include/client.h" +#include "qw/include/game.h" +#include "qw/include/host.h" +#include "netchan.h" CLIENT_PLUGIN_PROTOS static plugin_list_t client_plugin_list[] = { diff --git a/qw/source/cl_ngraph.c b/qw/source/cl_ngraph.c index 2503c8ee4..21891f471 100644 --- a/qw/source/cl_ngraph.c +++ b/qw/source/cl_ngraph.c @@ -41,8 +41,9 @@ #include "QF/screen.h" #include "compat.h" -#include "cl_parse.h" -#include "client.h" + +#include "qw/include/cl_parse.h" +#include "qw/include/client.h" #include "sbar.h" cvar_t *r_netgraph; diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c index a271c1197..2446413d6 100644 --- a/qw/source/cl_parse.c +++ b/qw/source/cl_parse.c @@ -61,24 +61,26 @@ #include "QF/teamplay.h" #include "QF/va.h" -#include "qw/bothdefs.h" -#include "cl_cam.h" -#include "cl_chat.h" -#include "cl_ents.h" -#include "cl_http.h" -#include "cl_input.h" -#include "cl_main.h" -#include "cl_parse.h" -#include "cl_skin.h" -#include "cl_tent.h" -#include "client.h" #include "compat.h" -#include "host.h" -#include "map_cfg.h" +#include "clview.h" +#include "sbar.h" + +#include "qw/bothdefs.h" #include "qw/pmove.h" #include "qw/protocol.h" -#include "sbar.h" -#include "clview.h" + +#include "qw/include/cl_cam.h" +#include "qw/include/cl_chat.h" +#include "qw/include/cl_ents.h" +#include "qw/include/cl_http.h" +#include "qw/include/cl_input.h" +#include "qw/include/cl_main.h" +#include "qw/include/cl_parse.h" +#include "qw/include/cl_skin.h" +#include "qw/include/cl_tent.h" +#include "qw/include/client.h" +#include "qw/include/host.h" +#include "qw/include/map_cfg.h" const char *svc_strings[] = { "svc_bad", diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c index 6b110e46c..1ac6e5ca1 100644 --- a/qw/source/cl_pred.c +++ b/qw/source/cl_pred.c @@ -34,11 +34,12 @@ #include "QF/cvar.h" #include "QF/keys.h" -#include "qw/bothdefs.h" #include "compat.h" -#include "cl_ents.h" -#include "cl_pred.h" -#include "client.h" + +#include "qw/bothdefs.h" +#include "qw/include/cl_ents.h" +#include "qw/include/cl_pred.h" +#include "qw/include/client.h" #include "qw/pmove.h" cvar_t *cl_predict; diff --git a/qw/source/cl_rss.c b/qw/source/cl_rss.c index 447e25dcc..bb4cbd993 100644 --- a/qw/source/cl_rss.c +++ b/qw/source/cl_rss.c @@ -42,8 +42,8 @@ #include "QF/pcx.h" #include "QF/sys.h" -#include "cl_parse.h" -#include "client.h" +#include "qw/include/cl_parse.h" +#include "qw/include/client.h" void CL_RSShot_f (void) diff --git a/qw/source/cl_screen.c b/qw/source/cl_screen.c index adf20f7e4..5b81f65a7 100644 --- a/qw/source/cl_screen.c +++ b/qw/source/cl_screen.c @@ -44,10 +44,11 @@ #include "QF/pcx.h" #include "QF/screen.h" -#include "client.h" #include "clview.h" #include "sbar.h" +#include "qw/include/client.h" + static qpic_t *scr_net; static void diff --git a/qw/source/cl_skin.c b/qw/source/cl_skin.c index d533a58d3..21a9afea7 100644 --- a/qw/source/cl_skin.c +++ b/qw/source/cl_skin.c @@ -43,11 +43,12 @@ #include "QF/sys.h" #include "QF/va.h" -#include "cl_parse.h" -#include "cl_skin.h" -#include "client.h" #include "compat.h" -#include "host.h" + +#include "qw/include/cl_parse.h" +#include "qw/include/cl_skin.h" +#include "qw/include/client.h" +#include "qw/include/host.h" cvar_t *noskins; //XXX FIXME cvar_t *skin; diff --git a/qw/source/cl_slist.c b/qw/source/cl_slist.c index 21497f142..4b5ea16b8 100644 --- a/qw/source/cl_slist.c +++ b/qw/source/cl_slist.c @@ -68,9 +68,9 @@ #include "QF/va.h" #include "qw/bothdefs.h" -#include "cl_main.h" -#include "cl_slist.h" -#include "client.h" +#include "qw/include/cl_main.h" +#include "qw/include/cl_slist.h" +#include "qw/include/client.h" typedef struct server_entry_s { char *server; diff --git a/qw/source/cl_sys_sdl.c b/qw/source/cl_sys_sdl.c index 3a5f1385b..c3b620ca8 100644 --- a/qw/source/cl_sys_sdl.c +++ b/qw/source/cl_sys_sdl.c @@ -56,9 +56,10 @@ #include "QF/qargs.h" #include "QF/sys.h" -#include "host.h" #include "netchan.h" +#include "qw/include/host.h" + #ifdef _WIN32 # include "winquake.h" #endif diff --git a/qw/source/cl_sys_unix.c b/qw/source/cl_sys_unix.c index 4c7071ba2..d0ef58225 100644 --- a/qw/source/cl_sys_unix.c +++ b/qw/source/cl_sys_unix.c @@ -48,9 +48,10 @@ #include "QF/qargs.h" #include "QF/sys.h" -#include "host.h" #include "netchan.h" +#include "qw/include/host.h" + static void shutdown_f (void *data) { diff --git a/qw/source/cl_sys_win.c b/qw/source/cl_sys_win.c index 388166e7a..6fe2fbe06 100644 --- a/qw/source/cl_sys_win.c +++ b/qw/source/cl_sys_win.c @@ -34,8 +34,8 @@ #include "QF/screen.h" #include "QF/sys.h" -#include "client.h" -#include "host.h" +#include "qw/include/client.h" +#include "qw/include/host.h" #define MAXIMUM_WIN_MEMORY 0x1000000 #define MINIMUM_WIN_MEMORY 0x0c00000 diff --git a/qw/source/cl_tent.c b/qw/source/cl_tent.c index 43e5930d0..950734bea 100644 --- a/qw/source/cl_tent.c +++ b/qw/source/cl_tent.c @@ -44,13 +44,14 @@ #include "QF/sound.h" #include "QF/sys.h" -#include "cl_ents.h" -#include "cl_main.h" -#include "cl_parse.h" -#include "cl_tent.h" -#include "client.h" #include "compat.h" +#include "qw/include/cl_ents.h" +#include "qw/include/cl_main.h" +#include "qw/include/cl_parse.h" +#include "qw/include/cl_tent.h" +#include "qw/include/client.h" + typedef struct tent_s { struct tent_s *next; entity_t ent; diff --git a/qw/source/cl_view.c b/qw/source/cl_view.c index 09633388b..4ad5da14f 100644 --- a/qw/source/cl_view.c +++ b/qw/source/cl_view.c @@ -33,16 +33,18 @@ #include "QF/msg.h" #include "QF/screen.h" -#include "qw/bothdefs.h" -#include "chase.h" -#include "cl_cam.h" -#include "cl_ents.h" -#include "cl_main.h" -#include "client.h" #include "compat.h" -#include "host.h" #include "clview.h" +#include "qw/bothdefs.h" + +#include "qw/include/chase.h" +#include "qw/include/cl_cam.h" +#include "qw/include/cl_ents.h" +#include "qw/include/cl_main.h" +#include "qw/include/client.h" +#include "qw/include/host.h" + /* The view is allowed to move slightly from it's true position for bobbing, but if it exceeds 8 pixels linear distance (spherical, not box), the list diff --git a/qw/source/crudefile.c b/qw/source/crudefile.c index 58426ad4d..3050a6efc 100644 --- a/qw/source/crudefile.c +++ b/qw/source/crudefile.c @@ -50,7 +50,8 @@ #include "QF/zone.h" #include "compat.h" -#include "crudefile.h" + +#include "qw/include/crudefile.h" int cf_maxsize; // max combined file size (eg quota) int cf_cursize; // current combined file size diff --git a/qw/source/game.c b/qw/source/game.c index ac69d83ea..df180b306 100644 --- a/qw/source/game.c +++ b/qw/source/game.c @@ -43,8 +43,8 @@ #include "QF/quakefs.h" #include "QF/sys.h" -#include "game.h" -#include "server.h" +#include "qw/include/game.h" +#include "qw/include/server.h" cvar_t *registered; int static_registered = 1; // only for startup check, then set diff --git a/qw/source/locs.c b/qw/source/locs.c index 2f94da0f8..c30080dd7 100644 --- a/qw/source/locs.c +++ b/qw/source/locs.c @@ -47,9 +47,10 @@ #include "QF/sys.h" #include "QF/va.h" -#include "client.h" #include "compat.h" +#include "qw/include/client.h" + #define LOCATION_BLOCK 128 // 128 locations per block. location_t **locations = NULL; diff --git a/qw/source/map_cfg.c b/qw/source/map_cfg.c index 10b4a5cd5..296bad56b 100644 --- a/qw/source/map_cfg.c +++ b/qw/source/map_cfg.c @@ -44,7 +44,7 @@ #include "QF/idparse.h" #include "QF/quakefs.h" -#include "map_cfg.h" +#include "qw/include/map_cfg.h" void map_cfg (const char *mapname, int all) diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c index 189c6fefe..3d2c58dc8 100644 --- a/qw/source/net_packetlog.c +++ b/qw/source/net_packetlog.c @@ -54,9 +54,10 @@ #include "QF/va.h" #include "compat.h" + #include "netchan.h" #include "qw/protocol.h" -#include "server.h" +#include "qw/include/server.h" cvar_t *net_packetlog; cvar_t *net_loglevel; diff --git a/qw/source/pmove.c b/qw/source/pmove.c index 31702c2f3..637528afa 100644 --- a/qw/source/pmove.c +++ b/qw/source/pmove.c @@ -34,8 +34,9 @@ #include "QF/qtypes.h" #include "QF/sys.h" -#include "client.h" #include "compat.h" + +#include "qw/include/client.h" #include "qw/pmove.h" cvar_t *no_pogo_stick; diff --git a/qw/source/pmovetst.c b/qw/source/pmovetst.c index da23aef9d..6b3857feb 100644 --- a/qw/source/pmovetst.c +++ b/qw/source/pmovetst.c @@ -41,6 +41,7 @@ #include "QF/sys.h" #include "compat.h" + #include "qw/pmove.h" #include "world.h" diff --git a/qw/source/sbar.c b/qw/source/sbar.c index 34490e43e..3a6e97778 100644 --- a/qw/source/sbar.c +++ b/qw/source/sbar.c @@ -54,11 +54,12 @@ #include "QF/plugin/console.h" -#include "qw/bothdefs.h" -#include "cl_cam.h" -#include "cl_parse.h" -#include "client.h" #include "compat.h" + +#include "qw/bothdefs.h" +#include "qw/include/cl_cam.h" +#include "qw/include/cl_parse.h" +#include "qw/include/client.h" #include "sbar.h" int sb_updates; // if >= vid.numpages, no update needed diff --git a/qw/source/sv_ccmds.c b/qw/source/sv_ccmds.c index 93c5247f6..aef14bea6 100644 --- a/qw/source/sv_ccmds.c +++ b/qw/source/sv_ccmds.c @@ -49,13 +49,14 @@ #include "QF/sys.h" #include "QF/va.h" -#include "qw/bothdefs.h" #include "compat.h" -#include "server.h" -#include "sv_demo.h" -#include "sv_progs.h" -#include "sv_qtv.h" -#include "sv_recorder.h" + +#include "qw/bothdefs.h" +#include "qw/include/server.h" +#include "qw/include/sv_demo.h" +#include "qw/include/sv_progs.h" +#include "qw/include/sv_qtv.h" +#include "qw/include/sv_recorder.h" qboolean sv_allow_cheats; diff --git a/qw/source/sv_demo.c b/qw/source/sv_demo.c index 65b6d397c..cc53372a8 100644 --- a/qw/source/sv_demo.c +++ b/qw/source/sv_demo.c @@ -47,11 +47,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "QF/va.h" #include "compat.h" + #include "qw/pmove.h" -#include "server.h" -#include "sv_demo.h" -#include "sv_progs.h" -#include "sv_recorder.h" +#include "qw/include/server.h" +#include "qw/include/sv_demo.h" +#include "qw/include/sv_progs.h" +#include "qw/include/sv_recorder.h" static QFile *demo_file; static byte *demo_mfile; diff --git a/qw/source/sv_ents.c b/qw/source/sv_ents.c index f6682337c..09e19ba83 100644 --- a/qw/source/sv_ents.c +++ b/qw/source/sv_ents.c @@ -39,11 +39,12 @@ #include "QF/msg.h" #include "QF/sys.h" +#include "compat.h" + #include "qw/msg_ucmd.h" -#include "compat.h" -#include "server.h" -#include "sv_progs.h" +#include "qw/include/server.h" +#include "qw/include/sv_progs.h" /* diff --git a/qw/source/sv_gib.c b/qw/source/sv_gib.c index 7600805d2..3e4d5421c 100644 --- a/qw/source/sv_gib.c +++ b/qw/source/sv_gib.c @@ -39,8 +39,8 @@ #include "QF/info.h" #include "QF/gib.h" -#include "server.h" -#include "client.h" +#include "qw/include/server.h" +#include "qw/include/client.h" gib_event_t *sv_chat_e; gib_event_t *sv_client_connect_e; diff --git a/qw/source/sv_init.c b/qw/source/sv_init.c index 7d8c894d1..d5b6d0d2c 100644 --- a/qw/source/sv_init.c +++ b/qw/source/sv_init.c @@ -44,12 +44,13 @@ #include "QF/va.h" #include "compat.h" -#include "crudefile.h" -#include "map_cfg.h" + +#include "qw/include/crudefile.h" +#include "qw/include/map_cfg.h" #include "qw/pmove.h" -#include "server.h" -#include "sv_progs.h" -#include "sv_gib.h" +#include "qw/include/server.h" +#include "qw/include/sv_progs.h" +#include "qw/include/sv_gib.h" #include "world.h" info_t *localinfo; // local game info diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c index 56d135e16..81d605e37 100644 --- a/qw/source/sv_main.c +++ b/qw/source/sv_main.c @@ -77,19 +77,20 @@ #include "QF/plugin/console.h" -#include "qw/bothdefs.h" #include "buildnum.h" #include "compat.h" -#include "crudefile.h" -#include "game.h" #include "netchan.h" + +#include "qw/bothdefs.h" +#include "qw/include/crudefile.h" +#include "qw/include/game.h" #include "qw/pmove.h" -#include "server.h" -#include "sv_demo.h" -#include "sv_progs.h" -#include "sv_gib.h" -#include "sv_qtv.h" -#include "sv_recorder.h" +#include "qw/include/server.h" +#include "qw/include/sv_demo.h" +#include "qw/include/sv_progs.h" +#include "qw/include/sv_gib.h" +#include "qw/include/sv_qtv.h" +#include "qw/include/sv_recorder.h" SERVER_PLUGIN_PROTOS static plugin_list_t server_plugin_list[] = { diff --git a/qw/source/sv_move.c b/qw/source/sv_move.c index 013e4d48e..75b4f8e01 100644 --- a/qw/source/sv_move.c +++ b/qw/source/sv_move.c @@ -28,8 +28,8 @@ # include "config.h" #endif -#include "server.h" -#include "sv_progs.h" +#include "qw/include/server.h" +#include "qw/include/sv_progs.h" #include "world.h" #define STEPSIZE 18 diff --git a/qw/source/sv_phys.c b/qw/source/sv_phys.c index e2d08e814..9c627f9e9 100644 --- a/qw/source/sv_phys.c +++ b/qw/source/sv_phys.c @@ -31,8 +31,8 @@ #include "QF/cvar.h" #include "QF/sys.h" -#include "server.h" -#include "sv_progs.h" +#include "qw/include/server.h" +#include "qw/include/sv_progs.h" #include "world.h" /* diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c index 46a9cc4e3..49f0cc332 100644 --- a/qw/source/sv_pr_cmds.c +++ b/qw/source/sv_pr_cmds.c @@ -46,11 +46,12 @@ #include "QF/va.h" #include "compat.h" -#include "crudefile.h" -#include "server.h" -#include "sv_gib.h" -#include "sv_progs.h" -#include "sv_recorder.h" + +#include "qw/include/crudefile.h" +#include "qw/include/server.h" +#include "qw/include/sv_gib.h" +#include "qw/include/sv_progs.h" +#include "qw/include/sv_recorder.h" #include "world.h" /* BUILT-IN FUNCTIONS */ diff --git a/qw/source/sv_pr_cpqw.c b/qw/source/sv_pr_cpqw.c index 4263cc097..e2ac3ffd2 100644 --- a/qw/source/sv_pr_cpqw.c +++ b/qw/source/sv_pr_cpqw.c @@ -39,9 +39,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "QF/quakefs.h" #include "QF/sys.h" -#include "server.h" -#include "sv_pr_cpqw.h" -#include "sv_progs.h" +#include "qw/include/server.h" +#include "qw/include/sv_pr_cpqw.h" +#include "qw/include/sv_progs.h" #include "world.h" static struct { diff --git a/qw/source/sv_pr_qwe.c b/qw/source/sv_pr_qwe.c index 9a84892cf..010c8a5a6 100644 --- a/qw/source/sv_pr_qwe.c +++ b/qw/source/sv_pr_qwe.c @@ -50,10 +50,10 @@ #include "QF/sys.h" #include "QF/va.h" -#include "server.h" -#include "sv_pr_qwe.h" -#include "sv_progs.h" -#include "sv_recorder.h" +#include "qw/include/server.h" +#include "qw/include/sv_pr_qwe.h" +#include "qw/include/sv_progs.h" +#include "qw/include/sv_recorder.h" typedef struct { func_t timeofday; diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c index 2c4ff5c3f..276ee2875 100644 --- a/qw/source/sv_progs.c +++ b/qw/source/sv_progs.c @@ -42,10 +42,11 @@ #include "QF/sys.h" #include "compat.h" -#include "server.h" -#include "sv_progs.h" -#include "sv_pr_cpqw.h" -#include "sv_pr_qwe.h" + +#include "qw/include/server.h" +#include "qw/include/sv_progs.h" +#include "qw/include/sv_pr_cpqw.h" +#include "qw/include/sv_pr_qwe.h" #include "world.h" progs_t sv_pr_state; diff --git a/qw/source/sv_qtv.c b/qw/source/sv_qtv.c index a36b1c3cc..6804a51e3 100644 --- a/qw/source/sv_qtv.c +++ b/qw/source/sv_qtv.c @@ -48,9 +48,10 @@ #include "QF/va.h" #include "compat.h" -#include "server.h" -#include "sv_qtv.h" -#include "sv_recorder.h" + +#include "qw/include/server.h" +#include "qw/include/sv_qtv.h" +#include "qw/include/sv_recorder.h" typedef struct { netchan_t netchan; diff --git a/qw/source/sv_recorder.c b/qw/source/sv_recorder.c index 562fd94d3..d2555862e 100644 --- a/qw/source/sv_recorder.c +++ b/qw/source/sv_recorder.c @@ -49,10 +49,10 @@ #include "QF/sys.h" #include "qw/bothdefs.h" -#include "server.h" -#include "sv_demo.h" -#include "sv_progs.h" -#include "sv_recorder.h" +#include "qw/include/server.h" +#include "qw/include/sv_demo.h" +#include "qw/include/sv_progs.h" +#include "qw/include/sv_recorder.h" typedef struct dbuffer_s { byte *data; diff --git a/qw/source/sv_sbar.c b/qw/source/sv_sbar.c index a76729789..012a38835 100644 --- a/qw/source/sv_sbar.c +++ b/qw/source/sv_sbar.c @@ -37,9 +37,10 @@ #include "QF/plugin/console.h" -#include "server.h" #include "sv_console.h" -#include "sv_recorder.h" + +#include "qw/include/server.h" +#include "qw/include/sv_recorder.h" static void draw_cpu (view_t *view) diff --git a/qw/source/sv_send.c b/qw/source/sv_send.c index 54e53d347..400b9484e 100644 --- a/qw/source/sv_send.c +++ b/qw/source/sv_send.c @@ -46,11 +46,12 @@ #include "QF/sound.h" // FIXME: DEFAULT_SOUND_PACKET_* #include "QF/sys.h" -#include "qw/bothdefs.h" #include "compat.h" -#include "server.h" -#include "sv_progs.h" -#include "sv_recorder.h" + +#include "qw/bothdefs.h" +#include "qw/include/server.h" +#include "qw/include/sv_progs.h" +#include "qw/include/sv_recorder.h" #define CHAN_AUTO 0 #define CHAN_WEAPON 1 diff --git a/qw/source/sv_sys_unix.c b/qw/source/sv_sys_unix.c index 24b3adb4b..cb7aabbdd 100644 --- a/qw/source/sv_sys_unix.c +++ b/qw/source/sv_sys_unix.c @@ -43,7 +43,7 @@ #include "QF/qargs.h" #include "QF/sys.h" -#include "server.h" +#include "qw/include/server.h" #ifdef NeXT # include diff --git a/qw/source/sv_sys_win.c b/qw/source/sv_sys_win.c index 52f3b230a..20fbdfb4e 100644 --- a/qw/source/sv_sys_win.c +++ b/qw/source/sv_sys_win.c @@ -36,7 +36,7 @@ #include "QF/qargs.h" #include "QF/sys.h" -#include "server.h" +#include "qw/include/server.h" qboolean WinNT; server_static_t svs; diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c index b8aa5e8d4..f9c44f48f 100644 --- a/qw/source/sv_user.c +++ b/qw/source/sv_user.c @@ -53,16 +53,17 @@ #include "QF/sys.h" #include "QF/va.h" +#include "compat.h" + #include "qw/msg_ucmd.h" #include "qw/msg_ucmd.h" #include "qw/bothdefs.h" -#include "compat.h" #include "qw/pmove.h" -#include "server.h" -#include "sv_gib.h" -#include "sv_progs.h" -#include "sv_recorder.h" +#include "qw/include/server.h" +#include "qw/include/sv_gib.h" +#include "qw/include/sv_progs.h" +#include "qw/include/sv_recorder.h" #include "world.h" typedef struct ucmd_s { diff --git a/qw/source/teamplay.c b/qw/source/teamplay.c index 5da9dace2..c5df33cd3 100644 --- a/qw/source/teamplay.c +++ b/qw/source/teamplay.c @@ -50,11 +50,12 @@ #include "QF/sys.h" #include "QF/teamplay.h" -#include "qw/bothdefs.h" -#include "cl_input.h" -#include "client.h" #include "compat.h" +#include "qw/bothdefs.h" +#include "qw/include/cl_input.h" +#include "qw/include/client.h" + static qboolean died = false, recorded_location = false; static vec3_t death_location, last_recorded_location; diff --git a/qw/source/world.c b/qw/source/world.c index 0664c197e..bbf4d930e 100644 --- a/qw/source/world.c +++ b/qw/source/world.c @@ -43,8 +43,9 @@ #include "QF/sys.h" #include "compat.h" -#include "server.h" -#include "sv_progs.h" + +#include "qw/include/server.h" +#include "qw/include/sv_progs.h" #include "world.h" #define always_inline inline __attribute__((__always_inline__)) diff --git a/ruamoko/Makefile.am b/ruamoko/Makefile.am deleted file mode 100644 index b899690f8..000000000 --- a/ruamoko/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -SUBDIRS= include lib game gui cl_menu scheme @ruamoko_dirs@ -DIST_SUBDIRS=qwaq - -doc: Doxyfile - doxygen - -clean-local: - -rm -fr doxygen diff --git a/ruamoko/Makemodule.am b/ruamoko/Makemodule.am new file mode 100644 index 000000000..202fbffb6 --- /dev/null +++ b/ruamoko/Makemodule.am @@ -0,0 +1,10 @@ +ruamoko_libdir = $(datarootdir)/qfcc/lib +ruamoko_lib_LIBRARIES = + +include ruamoko/include/Makemodule.am +include ruamoko/lib/Makemodule.am +include ruamoko/game/Makemodule.am +include ruamoko/gui/Makemodule.am +include ruamoko/cl_menu/Makemodule.am +include ruamoko/scheme/Makemodule.am +include ruamoko/qwaq/Makemodule.am diff --git a/ruamoko/cl_menu/Makefile.am b/ruamoko/cl_menu/Makefile.am deleted file mode 100644 index 8c759d410..000000000 --- a/ruamoko/cl_menu/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign no-exeext - -QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) -QFCC=$(QFCC_DEP) - -GZ=@progs_gz@ -menu_libexec=menu.dat -menu_data=menu.plist menu.sym - -pkglibexecdir=@sharepath@/QF -pkgdatadir=@sharepath@/QF - -pkgdata_DATA= $(menu_data) -pkglibexec_PROGRAMS= $(menu_libexec) -EXTRA_PROGRAMS= $(menu_libexec) - -QCFLAGS=-qq -O -g -Wall -Werror -Wno-integer-divide -QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include -QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib -QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS) - -MKDIR_P = @MKDIR_P@ -am__mv = mv -f - -GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi -# BSD make can't handle $(shell foo) directives, and GNU make can't handle |= -# so we have to bite the bullet and pass this to the shell every time. - -SUFFIXES=.o .r -.r.o: - $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $< - @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo - @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo - -menu_src= \ - client_menu.r controls_o.r options.r options_util.r servlist.r \ - Frame.r HUD.r menu.r plistmenu.r \ - \ - CrosshairCvar.r CrosshairView.r CvarColor.r CvarColorView.r \ - CvarObject.r CvarRange.r CvarRangeView.r CvarString.r CvarStringView.r \ - CvarToggle.r CvarToggleView.r \ - MenuGroup.r MouseToggle.r ProxyView.r RunToggle.r SubMenu.r - -r_depfiles_remade= - -menu_dat_SOURCES=$(menu_src) -menu_obj=$(menu_src:.r=.o) -menu_dep=$(addprefix ./$(DEPDIR)/,$(menu_obj:.o=.Qo)) -menu.dat: $(menu_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a ../gui/libgui.a - $(QLINK) -o menu.dat $(menu_obj) ../gui/libgui.a ../lib/libcsqc.a ../lib/libr.a -include $(menu_dep) # am--include-marker -r_depfiles_remade += $(menu_dep) - -menu.sym: menu.dat - -$(r_depfiles_remade): - $(MKDIR_P) $(@D) - echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) - -EXTRA_DIST= $(menu_src) \ - CrosshairCvar.h CrosshairView.h CvarColor.h CvarColorView.h CvarObject.h \ - CvarRange.h CvarRangeView.h CvarString.h CvarStringView.h \ - CvarToggle.h CvarToggleView.h Frame.h HUD.h \ - MenuGroup.h MouseToggle.h ProxyView.h RunToggle.h SubMenu.h client_menu.h \ - controls_o.h menu.h options.h options_util.h plistmenu.h servlist.h \ - menu.plist -CLEANFILES= *.dat *.sym *.gz *.qfo *.o diff --git a/ruamoko/cl_menu/Makemodule.am b/ruamoko/cl_menu/Makemodule.am new file mode 100644 index 000000000..dfa7635ba --- /dev/null +++ b/ruamoko/cl_menu/Makemodule.am @@ -0,0 +1,77 @@ +ruamoko_cl_menu_libexec=ruamoko/cl_menu/menu.dat$(EXEEXT) +ruamoko_cl_menu_data=ruamoko/cl_menu/menu.plist ruamoko/cl_menu/menu.sym + +ruamoko_cl_menudir = @sharepath@/QF +ruamoko_cl_menu_DATA = $(ruamoko_cl_menu_data) +ruamoko_cl_menu_PROGRAMS = $(ruamoko_cl_menu_libexec) +EXTRA_PROGRAMS += $(ruamoko_cl_menu_libexec) + +ruamoko_menu_src= \ + ruamoko/cl_menu/client_menu.r \ + ruamoko/cl_menu/controls_o.r \ + ruamoko/cl_menu/options.r \ + ruamoko/cl_menu/options_util.r \ + ruamoko/cl_menu/servlist.r \ + ruamoko/cl_menu/Frame.r \ + ruamoko/cl_menu/HUD.r \ + ruamoko/cl_menu/menu.r \ + ruamoko/cl_menu/plistmenu.r \ + ruamoko/cl_menu/CrosshairCvar.r \ + ruamoko/cl_menu/CrosshairView.r \ + ruamoko/cl_menu/CvarColor.r \ + ruamoko/cl_menu/CvarColorView.r \ + ruamoko/cl_menu/CvarObject.r \ + ruamoko/cl_menu/CvarRange.r \ + ruamoko/cl_menu/CvarRangeView.r \ + ruamoko/cl_menu/CvarString.r \ + ruamoko/cl_menu/CvarStringView.r \ + ruamoko/cl_menu/CvarToggle.r \ + ruamoko/cl_menu/CvarToggleView.r \ + ruamoko/cl_menu/MenuGroup.r \ + ruamoko/cl_menu/MouseToggle.r \ + ruamoko/cl_menu/ProxyView.r \ + ruamoko/cl_menu/RunToggle.r \ + ruamoko/cl_menu/SubMenu.r + +ruamoko_cl_menu_menu_dat_SOURCES=$(ruamoko_menu_src) +ruamoko_menu_obj=$(ruamoko_cl_menu_menu_dat_SOURCES:.r=.o) +ruamoko_menu_dep=$(call qcautodep,$(ruamoko_cl_menu_menu_dat_SOURCES)) +ruamoko/cl_menu/menu.dat$(EXEEXT): $(ruamoko_menu_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a ruamoko/gui/libgui.a + $(QLINK) -o $@ $(ruamoko_menu_obj) -Lruamoko/gui -lgui -lcsqc -lr +include $(ruamoko_menu_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_menu_dep) + +ruamoko/cl_menu/menu.sym: ruamoko/cl_menu/menu.dat + +EXTRA_DIST += \ + ruamoko/cl_menu/CrosshairCvar.h \ + ruamoko/cl_menu/CrosshairView.h \ + ruamoko/cl_menu/CvarColor.h \ + ruamoko/cl_menu/CvarColorView.h \ + ruamoko/cl_menu/CvarObject.h \ + ruamoko/cl_menu/CvarRange.h \ + ruamoko/cl_menu/CvarRangeView.h \ + ruamoko/cl_menu/CvarString.h \ + ruamoko/cl_menu/CvarStringView.h \ + ruamoko/cl_menu/CvarToggle.h \ + ruamoko/cl_menu/CvarToggleView.h \ + ruamoko/cl_menu/Frame.h \ + ruamoko/cl_menu/HUD.h \ + ruamoko/cl_menu/MenuGroup.h \ + ruamoko/cl_menu/MouseToggle.h \ + ruamoko/cl_menu/ProxyView.h \ + ruamoko/cl_menu/RunToggle.h \ + ruamoko/cl_menu/SubMenu.h \ + ruamoko/cl_menu/client_menu.h \ + ruamoko/cl_menu/controls_o.h \ + ruamoko/cl_menu/menu.h \ + ruamoko/cl_menu/options.h \ + ruamoko/cl_menu/options_util.h \ + ruamoko/cl_menu/plistmenu.h \ + ruamoko/cl_menu/servlist.h \ + ruamoko/cl_menu/menu.plist + +CLEANFILES += \ + ruamoko/cl_menu/*.dat \ + ruamoko/cl_menu/*.sym +DISTCLEANFILES += $(ruamoko_menu_dep) diff --git a/ruamoko/game/Makefile.am b/ruamoko/game/Makefile.am deleted file mode 100644 index fe9a38f5f..000000000 --- a/ruamoko/game/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign no-exeext - -QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) -QFCC=$(QFCC_DEP) - -GZ=@progs_gz@ -game_libexec=game.dat - -pkglibexecdir=@sharepath@/QF - -# this will eventually go into pkglibexecdir, but for now... -noinst_PROGRAMS= $(game_libexec) -EXTRA_PROGRAMS= $(game_libexec) - -QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide -QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib -QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS) - -MKDIR_P = @MKDIR_P@ -am__mv = mv -f - -GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi -# BSD make can't handle $(shell foo) directives, and GNU make can't handle |= -# so we have to bite the bullet and pass this to the shell every time. - -SUFFIXES=.o .r -.r.o: - $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $< - @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo - @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo - -game_src= Axe.r GameEntity.r World.r tempent.r - -r_depfiles_remade= - -game_dat_SOURCES=$(game_src) -game_obj=$(game_src:.r=.o) -game_dep=$(addprefix ./$(DEPDIR)/,$(game_obj:.o=.Qo)) -game.dat: $(game_obj) $(QFCC_DEP) ../lib/libr.a ../lib/libqw.a - $(QLINK) -o game.dat $(game_obj) ../lib/libr.a ../lib/libqw.a ../lib/libr.a -include $(game_dep) # am--include-marker -r_depfiles_remade += $(game_dep) - -game.sym: game.dat - -$(r_depfiles_remade): - $(MKDIR_P) $(@D) - echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) - -EXTRA_DIST= $(game_src) Axe.h GameEntity.h tempent.h Weapon.h World.h -CLEANFILES= *.dat *.sym *.gz *.o *.qfo diff --git a/ruamoko/game/Makemodule.am b/ruamoko/game/Makemodule.am new file mode 100644 index 000000000..4063e9a62 --- /dev/null +++ b/ruamoko/game/Makemodule.am @@ -0,0 +1,27 @@ +ruamoko_game_libexec=ruamoko/game/game.dat$(EXEEXT) + +noinst_PROGRAMS += $(ruamoko_game_libexec) +EXTRA_PROGRAMS += $(ruamoko_game_libexec) + +ruamoko_game_src= ruamoko/game/Axe.r ruamoko/game/GameEntity.r ruamoko/game/World.r ruamoko/game/tempent.r + +ruamoko_game_game_dat_SOURCES=$(ruamoko_game_src) +ruamoko_game_obj=$(ruamoko_game_game_dat_SOURCES:.r=.o) +ruamoko_game_dep=$(call qcautodep,$(ruamoko_game_game_dat_SOURCES)) +ruamoko/game/game.dat$(EXEEXT): $(ruamoko_game_obj) $(QFCC_DEP) ruamoko/lib/libr.a ruamoko/lib/libqw.a + $(QLINK) -o $@ $(ruamoko_game_obj) -lqw -lr +include $(ruamoko_game_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_game_dep) + +ruamoko/game/game.sym: ruamoko/game/game.dat + +EXTRA_DIST += $(ruamoko_game_src) \ + ruamoko/game/Axe.h \ + ruamoko/game/GameEntity.h \ + ruamoko/game/tempent.h \ + ruamoko/game/Weapon.h \ + ruamoko/game/World.h +CLEANFILES += \ + ruamoko/game/*.dat \ + ruamoko/game/*.sym +DISTCLEANFILES += $(ruamoko_game_dep) diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am deleted file mode 100644 index 0edd447d4..000000000 --- a/ruamoko/gui/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) -QFCC=$(QFCC_DEP) - -gui_libs=libgui.a -libs=$(gui_libs) - -pkglibdir=$(datarootdir)/qfcc/lib - -pkglib_LIBRARIES= $(libs) -EXTRA_LIBRARIES= $(gui_libs) - -QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) -QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths -QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib -QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS) - -MKDIR_P = @MKDIR_P@ -am__mv = mv -f - -PAK=$(top_builddir)/tools/pak/pak$(EXEEXT) -RANLIB=touch - -SUFFIXES= .o .r -.r.o: - $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $< - @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo - @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo - -r_depfiles_remade= - -libgui_a_SOURCES= \ - Group.r InputLine.r Pic.r Point.r Rect.r Size.r Slider.r Text.r View.r -libgui_a_obj=$(libgui_a_SOURCES:.r=.o) -libgui_a_dep=$(addprefix ./$(DEPDIR)/,$(libgui_a_obj:.o=.Qo)) -libgui_a_AR= $(PAK) -cf -include $(libgui_a_dep) # am--include-marker -r_depfiles_remade += $(libgui_a_dep) - -$(r_depfiles_remade): - $(MKDIR_P) $(@D) - echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) - - -CLEANFILES= *.qfo *.o diff --git a/ruamoko/gui/Makemodule.am b/ruamoko/gui/Makemodule.am new file mode 100644 index 000000000..ee25d5111 --- /dev/null +++ b/ruamoko/gui/Makemodule.am @@ -0,0 +1,25 @@ +ruamoko_gui_gui_libs=ruamoko/gui/libgui.a + +ruamoko_lib_LIBRARIES += $(ruamoko_gui_gui_libs) +EXTRA_LIBRARIES += $(ruamoko_gui_gui_libs) + +ruamoko_gui_libgui_a_SOURCES= \ + ruamoko/gui/Group.r \ + ruamoko/gui/InputLine.r \ + ruamoko/gui/Pic.r \ + ruamoko/gui/Point.r \ + ruamoko/gui/Rect.r \ + ruamoko/gui/Size.r \ + ruamoko/gui/Slider.r \ + ruamoko/gui/Text.r \ + ruamoko/gui/View.r +ruamoko_gui_libgui_a_dep=$(call qcautodep,$(ruamoko_gui_libgui_a_SOURCES)) +ruamoko_gui_libgui_a_AR= $(PAK) -cf +EXTRA_ruamoko_gui_libgui_a_DEPENDENCIES=pak +include $(ruamoko_gui_libgui_a_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_gui_libgui_a_dep) + +CLEANFILES += \ + ruamoko/gui/*.dat \ + ruamoko/gui/*.sym +DISTCLEANFILES += $(ruamoko_gui_libgui_a_dep) diff --git a/ruamoko/include/Makefile.am b/ruamoko/include/Makefile.am deleted file mode 100644 index 0964419bf..000000000 --- a/ruamoko/include/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -AUTOMAKE_OPTIONS= foreign -pkgincludedir= $(datarootdir)/qfcc/include -nobase_pkginclude_HEADERS= \ - crudefile.h debug.h entities.h infokey.h math.h message.h nq_message.h \ - physics.h msgbuf.h qfile.h qfs.h qw_message.h qw_physics.h qw_sys.h \ - server.h sound.h script.h string.h sv_sound.h system.h types.h \ - legacy_string.h \ - \ - draw.h key.h \ - \ - cbuf.h cmd.h cvar.h gib.h hash.h plist.h runtime.h \ - Object.h Protocol.h \ - AutoreleasePool.h Array.h Entity.h PropertyList.h Set.h \ - \ - gui/Group.h gui/InputLine.h gui/Pic.h gui/Point.h gui/Rect.h gui/Size.h \ - gui/Slider.h gui/Text.h gui/View.h diff --git a/ruamoko/include/Makemodule.am b/ruamoko/include/Makemodule.am new file mode 100644 index 000000000..d53289e72 --- /dev/null +++ b/ruamoko/include/Makemodule.am @@ -0,0 +1,56 @@ +ruamoko_include = \ + ruamoko/include/crudefile.h \ + ruamoko/include/debug.h \ + ruamoko/include/entities.h \ + ruamoko/include/infokey.h \ + ruamoko/include/math.h \ + ruamoko/include/message.h \ + ruamoko/include/nq_message.h \ + ruamoko/include/physics.h \ + ruamoko/include/msgbuf.h \ + ruamoko/include/qfile.h \ + ruamoko/include/qfs.h \ + ruamoko/include/qw_message.h \ + ruamoko/include/qw_physics.h \ + ruamoko/include/qw_sys.h \ + ruamoko/include/server.h \ + ruamoko/include/sound.h \ + ruamoko/include/script.h \ + ruamoko/include/string.h \ + ruamoko/include/sv_sound.h \ + ruamoko/include/system.h \ + ruamoko/include/types.h \ + ruamoko/include/legacy_string.h \ + ruamoko/include/draw.h \ + ruamoko/include/key.h \ + ruamoko/include/cbuf.h \ + ruamoko/include/cmd.h \ + ruamoko/include/cvar.h \ + ruamoko/include/gib.h \ + ruamoko/include/hash.h \ + ruamoko/include/plist.h \ + ruamoko/include/runtime.h \ + ruamoko/include/Object.h \ + ruamoko/include/Protocol.h \ + ruamoko/include/AutoreleasePool.h \ + ruamoko/include/Array.h \ + ruamoko/include/Entity.h \ + ruamoko/include/PropertyList.h \ + ruamoko/include/Set.h + +ruamoko_gui_include = \ + ruamoko/include/gui/Group.h \ + ruamoko/include/gui/InputLine.h \ + ruamoko/include/gui/Pic.h \ + ruamoko/include/gui/Point.h \ + ruamoko/include/gui/Rect.h \ + ruamoko/include/gui/Size.h \ + ruamoko/include/gui/Slider.h \ + ruamoko/include/gui/Text.h \ + ruamoko/include/gui/View.h + +ruamoko_includedir = $(datarootdir)/qfcc/include +ruamoko_gui_includedir = $(datarootdir)/qfcc/include/gui + +ruamoko_include_HEADERS = $(ruamoko_include) +ruamoko_gui_include_HEADERS = $(ruamoko_gui_include) diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am deleted file mode 100644 index b05db7299..000000000 --- a/ruamoko/lib/Makefile.am +++ /dev/null @@ -1,96 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) -QFCC=$(QFCC_DEP) - -ruamoko_libs=libr.a libqw.a libnq.a libcsqc.a -libs=$(ruamoko_libs) - -pkglibdir=$(datarootdir)/qfcc/lib - -pkglib_LIBRARIES= $(libs) -EXTRA_LIBRARIES= $(ruamoko_libs) - -noinst_HEADERS= \ - Array+Private.h - -QCFLAGS=-qq -O -g -Wall -Wno-integer-divide -Werror -QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include -QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib -QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS) - -MKDIR_P = @MKDIR_P@ -am__mv = mv -f - -PAK=$(top_builddir)/tools/pak/pak$(EXEEXT) -RANLIB=touch - -SUFFIXES= .o .r -.r.o: - $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $< - @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo - @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo - -r_depfiles_remade= - -libr_a_SOURCES=\ - cbuf.r cmd.r cvar.r hash.r msgbuf.r plist.r qfile.r qfs.r script.r \ - sound.r string.r math.r types.r va_list.r \ - obj_forward.r \ - Object.r Protocol.r \ - AutoreleasePool.r Array.r Array+Private.r Entity.r PropertyList.r Set.r -libr_a_obj=$(libr_a_SOURCES:.r=.o) -libr_a_dep=$(addprefix ./$(DEPDIR)/,$(libr_a_obj:.o=.Qo)) -libr_a_AR=$(PAK) -cf -include $(libr_a_dep) # am--include-marker -r_depfiles_remade += $(libr_a_dep) - -common_src=debug.r system.r legacy_string.r -server_src= \ - crudefile.r entities.r infokey.r message.r \ - physics.r server.r sv_sound.r -libqw_a_src= \ - qw_message.r qw_physics.r qw_sys.r -libnq_a_src= \ - nq_message.r -libcsqc_a_src= draw.r gib.r key.r - -common_obj=$(common_src:.r=.o) -common_dep=$(addprefix ./$(DEPDIR)/,$(common_obj:.o=.Qo)) -include $(common_dep) # am--include-marker -r_depfiles_remade += $(common_dep) - -server_obj=$(server_src:.r=.o) -server_dep=$(addprefix ./$(DEPDIR)/,$(server_obj:.o=.Qo)) -include $(server_dep) # am--include-marker -r_depfiles_remade += $(server_dep) - -libqw_a_SOURCES=$(libqw_a_src) $(common_src) $(server_src) math.r -libqw_a_obj=$(libqw_a_src:.r=.o) -libqw_a_dep=$(addprefix ./$(DEPDIR)/,$(libqw_a_obj:.o=.Qo)) -libqw_a_AR=$(PAK) -cf -include $(libqw_a_dep) # am--include-marker -r_depfiles_remade += $(libqw_a_dep) - -libnq_a_SOURCES=$(libnq_a_src) $(common_src) $(server_src) math.r -libnq_a_obj=$(libnq_a_src:.r=.o) -libnq_a_dep=$(addprefix ./$(DEPDIR)/,$(libnq_a_obj:.o=.Qo)) -libnq_a_AR=$(PAK) -cf -include $(libnq_a_dep) # am--include-marker -r_depfiles_remade += $(libnq_a_dep) - -libcsqc_a_SOURCES=$(libcsqc_a_src) $(common_src) -libcsqc_a_obj=$(libcsqc_a_src:.r=.o) -libcsqc_a_dep=$(addprefix ./$(DEPDIR)/,$(libcsqc_a_obj:.o=.Qo)) -libcsqc_a_AR= $(PAK) -cf -include $(libcsqc_a_dep) # am--include-marker -r_depfiles_remade += $(libcsqc_a_dep) - -$(r_depfiles_remade): - $(MKDIR_P) $(@D) - echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) - -CLEANFILES= *.qfo *.o diff --git a/ruamoko/lib/Makemodule.am b/ruamoko/lib/Makemodule.am new file mode 100644 index 000000000..0d189f6b7 --- /dev/null +++ b/ruamoko/lib/Makemodule.am @@ -0,0 +1,87 @@ +ruamoko_libs=ruamoko/lib/libr.a ruamoko/lib/libqw.a ruamoko/lib/libnq.a ruamoko/lib/libcsqc.a + +ruamoko_lib_LIBRARIES += $(ruamoko_libs) +EXTRA_LIBRARIES += $(ruamoko_libs) + +noinst_HEADERS += \ + ruamoko/lib/Array+Private.h + +ruamoko_lib_libr_a_SOURCES=\ + ruamoko/lib/cbuf.r \ + ruamoko/lib/cmd.r \ + ruamoko/lib/cvar.r \ + ruamoko/lib/hash.r \ + ruamoko/lib/msgbuf.r \ + ruamoko/lib/plist.r \ + ruamoko/lib/qfile.r \ + ruamoko/lib/qfs.r \ + ruamoko/lib/script.r \ + ruamoko/lib/sound.r \ + ruamoko/lib/string.r \ + ruamoko/lib/math.r \ + ruamoko/lib/types.r \ + ruamoko/lib/va_list.r \ + ruamoko/lib/obj_forward.r \ + ruamoko/lib/Object.r \ + ruamoko/lib/Protocol.r \ + ruamoko/lib/AutoreleasePool.r \ + ruamoko/lib/Array.r \ + ruamoko/lib/Array+Private.r \ + ruamoko/lib/Entity.r \ + ruamoko/lib/PropertyList.r \ + ruamoko/lib/Set.r +ruamoko_lib_libr_a_dep=$(call qcautodep,$(ruamoko_lib_libr_a_SOURCES)) +ruamoko_lib_libr_a_AR=$(PAK) -cf +EXTRA_ruamoko_lib_libr_a_DEPENDENCIES=pak +include $(ruamoko_lib_libr_a_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_lib_libr_a_dep) + +ruamoko_lib_common_src=ruamoko/lib/debug.r ruamoko/lib/system.r ruamoko/lib/legacy_string.r +ruamoko_lib_server_src= \ + ruamoko/lib/crudefile.r ruamoko/lib/entities.r ruamoko/lib/infokey.r ruamoko/lib/message.r \ + ruamoko/lib/physics.r ruamoko/lib/server.r ruamoko/lib/sv_sound.r +ruamoko_lib_libqw_a_src= \ + ruamoko/lib/qw_message.r ruamoko/lib/qw_physics.r ruamoko/lib/qw_sys.r +ruamoko_lib_libnq_a_src= \ + ruamoko/lib/nq_message.r +ruamoko_lib_libcsqc_a_src= ruamoko/lib/draw.r ruamoko/lib/gib.r ruamoko/lib/key.r + +ruamoko_lib_common_dep=$(call qcautodep,$(ruamoko_lib_common_src)) +include $(ruamoko_lib_common_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_lib_common_dep) + +ruamoko_lib_server_dep=$(call qcautodep,$(ruamoko_lib_server_src)) +include $(ruamoko_lib_server_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_lib_server_dep) + +ruamoko_lib_libqw_a_SOURCES=$(ruamoko_lib_libqw_a_src) $(ruamoko_lib_common_src) $(ruamoko_lib_server_src) ruamoko/lib/math.r +ruamoko_lib_libqw_a_dep=$(call qcautodep,$(ruamoko_lib_libqw_a_src)) +ruamoko_lib_libqw_a_AR=$(PAK) -cf +EXTRA_ruamoko_lib_libqw_a_DEPENDENCIES=pak +include $(ruamoko_lib_libqw_a_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_lib_libqw_a_dep) + +ruamoko_lib_libnq_a_SOURCES=$(ruamoko_lib_libnq_a_src) $(ruamoko_lib_common_src) $(ruamoko_lib_server_src) ruamoko/lib/math.r +ruamoko_lib_libnq_a_dep=$(call qcautodep,$(ruamoko_lib_libnq_a_src)) +ruamoko_lib_libnq_a_AR=$(PAK) -cf +EXTRA_ruamoko_lib_libnq_a_DEPENDENCIES=pak +include $(ruamoko_lib_libnq_a_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_lib_libnq_a_dep) + +ruamoko_lib_libcsqc_a_SOURCES=$(ruamoko_lib_libcsqc_a_src) $(ruamoko_lib_common_src) +ruamoko_lib_libcsqc_a_dep=$(call qcautodep,$(ruamoko_lib_libcsqc_a_src)) +ruamoko_lib_libcsqc_a_AR= $(PAK) -cf +EXTRA_ruamoko_lib_libcsqc_a_DEPENDENCIES=pak +include $(ruamoko_lib_libcsqc_a_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_lib_libcsqc_a_dep) + +CLEANFILES += \ + ruamoko/lib/*.dat \ + ruamoko/lib/*.sym +DISTCLEANFILES += \ + $(ruamoko_lib_libr_a_dep) \ + $(ruamoko_lib_common_dep) \ + $(ruamoko_lib_server_dep) \ + $(ruamoko_lib_libqw_a_dep) \ + $(ruamoko_lib_libnq_a_dep) \ + $(ruamoko_lib_libcsqc_a_dep) diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am deleted file mode 100644 index 2208777f5..000000000 --- a/ruamoko/qwaq/Makefile.am +++ /dev/null @@ -1,135 +0,0 @@ -AUTOMAKE_OPTIONS= foreign subdir-objects - -QWAQ_LIBS=@QWAQ_LIBS@ -QWAQ_DEPS=@QWAQ_DEPS@ -QWAQ_INCS=@QWAQ_INCS@ - -AM_CPPFLAGS= -I$(srcdir) -I$(top_srcdir)/include $(QWAQ_INCS) $(PTHREAD_CFLAGS) - -noinst_PROGRAMS=@QWAQ_TARGETS@ qwaq-app.dat$(EXEEXT) gcd.dat$(EXEEXT) - -QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) -QFCC=$(top_builddir)/tools/qfcc/source/qfcc - -QCSYSTEM=--no-default-paths -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include -QWAQ_INC=-I$(srcdir) -I$(srcdir)/builtins -I$(srcdir)/debugger -I$(srcdir)/editor -I$(srcdir)/ui -QCFLAGS=-qq -O -g -Werror -QCPPFLAGS=$(QCSYSTEM) -I$(srcdir) -QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib -QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS) - -SUFFIXES=.o .r -.r.o: - $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $< - @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo - @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo - -qwaq_app_dat_src= \ - qwaq-app.r \ - debugger/views/basicview.r \ - debugger/views/defview.r \ - debugger/views/doubleview.r \ - debugger/views/entityview.r \ - debugger/views/fieldview.r \ - debugger/views/floatview.r \ - debugger/views/funcview.r \ - debugger/views/intview.r \ - debugger/views/nameview.r \ - debugger/views/pointerview.r\ - debugger/views/quatview.r \ - debugger/views/stringview.r \ - debugger/views/uintview.r \ - debugger/views/vectorview.r \ - debugger/views/voidview.r \ - debugger/debug.r \ - debugger/debugger.r \ - debugger/localsdata.r \ - debugger/typeencodings.r \ - editor/editbuffer.r \ - editor/editor.r \ - ui/button.r \ - ui/draw.r \ - ui/garray.r \ - ui/group.r \ - ui/listener.r \ - ui/proxyview.r \ - ui/rect.r \ - ui/scrollbar.r \ - ui/tableview.r \ - ui/textcontext.r \ - ui/titlebar.r \ - ui/view.r \ - ui/window.r \ - $e - -#FIXME this coupling is horrible -qwaq_curses_libs= \ - $(top_builddir)/libs/video/targets/libvid_common.la \ - $(top_builddir)/libs/console/libQFconsole.la \ - $(top_builddir)/libs/gib/libQFgib.la - -qwaq_curses_SOURCES= \ - builtins/main.c \ - builtins/curses.c \ - builtins/debug.c \ - builtins/editbuffer.c \ - builtins/input.c \ - $e - -qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \ - $(PANEL_LIBS) $(CURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS) -qwaq_curses_LDFLAGS= -qwaq_curses_DEPENDENCIES= $(qwaq_curses_libs) $(QWAQ_DEPS) - -cl_plugin_libs= \ - @client_static_plugin_libs@ - -client_libs= \ - $(top_builddir)/libs/console/libQFconsole.la \ - $(top_builddir)/libs/video/targets/libQFjs.la \ - $(top_builddir)/libs/audio/libQFcd.la \ - $(top_builddir)/libs/audio/libQFsound.la \ - $(top_builddir)/libs/image/libQFimage.la - -qwaq_x11_libs= \ - $(cl_plugin_libs) \ - $(top_builddir)/libs/video/renderer/libQFrenderer.la \ - $(top_builddir)/libs/models/libQFmodels.la \ - $(top_builddir)/libs/video/targets/libQFx11.la \ - $(client_libs) \ - $(top_builddir)/libs/gib/libQFgib.la -qwaq_x11_SOURCES=builtins/qwaq.c builtins/qwaq-bi.c -qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \ - $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \ - $(X_EXTRA_LIBS) $(X_SHM_LIB) $(DL_LIBS) -qwaq_x11_LDFLAGS= -qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS) - -r_depfiles_remade= - -qwaq_app_dat_SOURCES=$(qwaq_app_dat_src) -qwaq_app_obj=$(qwaq_app_dat_SOURCES:.r=.o) -qwaq_app_dep=$(addprefix ./$(DEPDIR)/,$(qwaq_app_obj:.o=.Qo)) -qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a - $(QLINK) -o $@ $(qwaq_app_obj) -lcsqc -lr -include $(qwaq_app_dep) # am--include-marker -r_depfiles_remade += $(qwaq_app_dep) - -gcd_dat_SOURCES=gcd.r -gcd_obj=$(gcd_dat_SOURCES:.r=.o) -gcd_dep=$(addprefix ./$(DEPDIR)/,$(gcd_obj:.o=.Qo)) -gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP) ../lib/libcsqc.a ../lib/libr.a - $(QLINK) -o $@ $(gcd_obj) -lcsqc -lr -include $(gcd_dep) # am--include-marker -r_depfiles_remade += $(gcd_dep) - -$(r_depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) - -EXTRA_PROGRAMS=qwaq-curses qwaq-x11 -EXTRA_DIST=$(qwaq_dat_src) qwaq.h -CLEANFILES= *.dat *.sym qwaq-curses.log diff --git a/ruamoko/qwaq/Makemodule.am b/ruamoko/qwaq/Makemodule.am new file mode 100644 index 000000000..149213268 --- /dev/null +++ b/ruamoko/qwaq/Makemodule.am @@ -0,0 +1,149 @@ +QWAQ_LIBS=@QWAQ_LIBS@ +QWAQ_DEPS=@QWAQ_DEPS@ +QWAQ_INCS=@QWAQ_INCS@ + +noinst_PROGRAMS += @QWAQ_TARGETS@ ruamoko/qwaq/qwaq-app.dat$(EXEEXT) ruamoko/qwaq/gcd.dat$(EXEEXT) + +qwaq_app_dat_src= \ + ruamoko/qwaq/qwaq-app.r \ + ruamoko/qwaq/debugger/views/basicview.r \ + ruamoko/qwaq/debugger/views/defview.r \ + ruamoko/qwaq/debugger/views/doubleview.r \ + ruamoko/qwaq/debugger/views/entityview.r \ + ruamoko/qwaq/debugger/views/fieldview.r \ + ruamoko/qwaq/debugger/views/floatview.r \ + ruamoko/qwaq/debugger/views/funcview.r \ + ruamoko/qwaq/debugger/views/intview.r \ + ruamoko/qwaq/debugger/views/nameview.r \ + ruamoko/qwaq/debugger/views/pointerview.r\ + ruamoko/qwaq/debugger/views/quatview.r \ + ruamoko/qwaq/debugger/views/stringview.r \ + ruamoko/qwaq/debugger/views/uintview.r \ + ruamoko/qwaq/debugger/views/vectorview.r \ + ruamoko/qwaq/debugger/views/voidview.r \ + ruamoko/qwaq/debugger/debug.r \ + ruamoko/qwaq/debugger/debugger.r \ + ruamoko/qwaq/debugger/localsdata.r \ + ruamoko/qwaq/debugger/typeencodings.r \ + ruamoko/qwaq/editor/editbuffer.r \ + ruamoko/qwaq/editor/editor.r \ + ruamoko/qwaq/ui/button.r \ + ruamoko/qwaq/ui/draw.r \ + ruamoko/qwaq/ui/garray.r \ + ruamoko/qwaq/ui/group.r \ + ruamoko/qwaq/ui/listener.r \ + ruamoko/qwaq/ui/proxyview.r \ + ruamoko/qwaq/ui/rect.r \ + ruamoko/qwaq/ui/scrollbar.r \ + ruamoko/qwaq/ui/tableview.r \ + ruamoko/qwaq/ui/textcontext.r \ + ruamoko/qwaq/ui/titlebar.r \ + ruamoko/qwaq/ui/view.r \ + ruamoko/qwaq/ui/window.r \ + $e + +#FIXME this coupling is horrible +qwaq_curses_libs= \ + libs/video/targets/libvid_common.la \ + libs/console/libQFconsole.la \ + libs/gib/libQFgib.la + +ruamoko_qwaq_qwaq_curses_SOURCES= \ + ruamoko/qwaq/builtins/main.c \ + ruamoko/qwaq/builtins/curses.c \ + ruamoko/qwaq/builtins/debug.c \ + ruamoko/qwaq/builtins/editbuffer.c \ + ruamoko/qwaq/builtins/input.c \ + $e + +ruamoko_qwaq_qwaq_curses_LDADD= $(qwaq_curses_libs) $(QWAQ_LIBS) \ + $(PANEL_LIBS) $(CURSES_LIBS) $(PTHREAD_LDFLAGS) $(DL_LIBS) +ruamoko_qwaq_qwaq_curses_LDFLAGS= +ruamoko_qwaq_qwaq_curses_DEPENDENCIES= $(qwaq_curses_libs) $(QWAQ_DEPS) + +qwaq_cl_plugin_libs= \ + @client_static_plugin_libs@ + +qwaq_client_libs= \ + $(top_builddir)/libs/console/libQFconsole.la \ + $(top_builddir)/libs/video/targets/libQFjs.la \ + $(top_builddir)/libs/audio/libQFcd.la \ + $(top_builddir)/libs/audio/libQFsound.la \ + $(top_builddir)/libs/image/libQFimage.la + +qwaq_x11_libs= \ + $(qwaq_cl_plugin_libs) \ + $(top_builddir)/libs/video/renderer/libQFrenderer.la \ + $(top_builddir)/libs/models/libQFmodels.la \ + $(top_builddir)/libs/video/targets/libQFx11.la \ + $(qwaq_client_libs) \ + $(top_builddir)/libs/gib/libQFgib.la +ruamoko_qwaq_qwaq_x11_SOURCES=ruamoko/qwaq/builtins/qwaq.c ruamoko/qwaq/builtins/qwaq-bi.c +ruamoko_qwaq_qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \ + $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \ + $(X_EXTRA_LIBS) $(X_SHM_LIB) $(DL_LIBS) +ruamoko_qwaq_qwaq_x11_LDFLAGS= +ruamoko_qwaq_qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS) + +ruamoko_qwaq_qwaq_app_dat_SOURCES=$(qwaq_app_dat_src) +ruamoko_qwaq_qwaq_app_obj=$(ruamoko_qwaq_qwaq_app_dat_SOURCES:.r=.o) +ruamoko_qwaq_qwaq_app_dep=$(call qcautodep,$(ruamoko_qwaq_qwaq_app_dat_SOURCES:.o=.Qo)) +ruamoko/qwaq/qwaq-app.dat$(EXEEXT): $(ruamoko_qwaq_qwaq_app_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a + $(QLINK) -o $@ $(ruamoko_qwaq_qwaq_app_obj) -lcsqc -lr +include $(ruamoko_qwaq_qwaq_app_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_qwaq_qwaq_app_dep) + +ruamoko_qwaq_gcd_dat_SOURCES=ruamoko/qwaq/gcd.r +ruamoko_qwaq_gcd_obj=$(ruamoko_qwaq_gcd_dat_SOURCES:.r=.o) +ruamoko_qwaq_gcd_dep=$(call qcautodep,$(ruamoko_qwaq_gcd_dat_SOURCES:.o=.Qo)) +ruamoko/qwaq/gcd.dat$(EXEEXT): $(ruamoko_qwaq_gcd_obj) $(QFCC_DEP) ruamoko/lib/libcsqc.a ruamoko/lib/libr.a + $(QLINK) -o $@ $(ruamoko_qwaq_gcd_obj) -lcsqc -lr +include $(ruamoko_qwaq_gcd_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_qwaq_gcd_dep) + +EXTRA_PROGRAMS += ruamoko/qwaq/qwaq-curses ruamoko/qwaq/qwaq-x11 +EXTRA_DIST += \ + $(qwaq_dat_src) \ + ruamoko/qwaq/debugger/debug.h \ + ruamoko/qwaq/debugger/debugger.h \ + ruamoko/qwaq/debugger/localsdata.h \ + ruamoko/qwaq/debugger/typeencodings.h \ + ruamoko/qwaq/debugger/views/basicview.h \ + ruamoko/qwaq/debugger/views/defview.h \ + ruamoko/qwaq/debugger/views/doubleview.h \ + ruamoko/qwaq/debugger/views/entityview.h \ + ruamoko/qwaq/debugger/views/fieldview.h \ + ruamoko/qwaq/debugger/views/floatview.h \ + ruamoko/qwaq/debugger/views/funcview.h \ + ruamoko/qwaq/debugger/views/intview.h \ + ruamoko/qwaq/debugger/views/nameview.h \ + ruamoko/qwaq/debugger/views/pointerview.h \ + ruamoko/qwaq/debugger/views/quatview.h \ + ruamoko/qwaq/debugger/views/stringview.h \ + ruamoko/qwaq/debugger/views/uintview.h \ + ruamoko/qwaq/debugger/views/vectorview.h \ + ruamoko/qwaq/debugger/views/voidview.h \ + ruamoko/qwaq/editor/editbuffer.h \ + ruamoko/qwaq/editor/editor.h \ + ruamoko/qwaq/qwaq-app.h \ + ruamoko/qwaq/qwaq.h \ + ruamoko/qwaq/ui/button.h \ + ruamoko/qwaq/ui/color.h \ + ruamoko/qwaq/ui/curses.h \ + ruamoko/qwaq/ui/draw.h \ + ruamoko/qwaq/ui/event.h \ + ruamoko/qwaq/ui/garray.h \ + ruamoko/qwaq/ui/group.h \ + ruamoko/qwaq/ui/listener.h \ + ruamoko/qwaq/ui/proxyview.h \ + ruamoko/qwaq/ui/rect.h \ + ruamoko/qwaq/ui/scrollbar.h \ + ruamoko/qwaq/ui/tableview.h \ + ruamoko/qwaq/ui/textcontext.h \ + ruamoko/qwaq/ui/titlebar.h \ + ruamoko/qwaq/ui/view.h \ + ruamoko/qwaq/ui/window.h +CLEANFILES += \ + ruamoko/qwaq/qwaq-curses.log \ + ruamoko/qwaq/*.dat \ + ruamoko/qwaq/*.sym diff --git a/ruamoko/qwaq/builtins/builtins.c b/ruamoko/qwaq/builtins/builtins.c index 3976dc330..9f575617c 100644 --- a/ruamoko/qwaq/builtins/builtins.c +++ b/ruamoko/qwaq/builtins/builtins.c @@ -42,7 +42,7 @@ #include #include -#include "qwaq.h" +#include "ruamoko/qwaq/qwaq.h" static void bi_print (progs_t *pr) diff --git a/ruamoko/qwaq/builtins/curses.c b/ruamoko/qwaq/builtins/curses.c index 3075f9412..8f543f493 100644 --- a/ruamoko/qwaq/builtins/curses.c +++ b/ruamoko/qwaq/builtins/curses.c @@ -46,10 +46,10 @@ #include "QF/ringbuffer.h" #include "QF/sys.h" -#include "qwaq.h" -#include "ui/curses.h" -#include "ui/rect.h" -#include "ui/textcontext.h" +#include "ruamoko/qwaq/qwaq.h" +#include "ruamoko/qwaq/ui/curses.h" +#include "ruamoko/qwaq/ui/rect.h" +#include "ruamoko/qwaq/ui/textcontext.h" #define always_inline inline __attribute__((__always_inline__)) #define CMD_SIZE(x) sizeof(x)/sizeof(x[0]) diff --git a/ruamoko/qwaq/builtins/debug.c b/ruamoko/qwaq/builtins/debug.c index be143ec87..bb22d35e2 100644 --- a/ruamoko/qwaq/builtins/debug.c +++ b/ruamoko/qwaq/builtins/debug.c @@ -47,10 +47,10 @@ #include "QF/quakefs.h" #include "QF/sys.h" -#include "qwaq.h" -#include "ui/event.h" -#include "ui/curses.h" -#include "debugger/debug.h" +#include "ruamoko/qwaq/qwaq.h" +#include "ruamoko/qwaq/ui/event.h" +#include "ruamoko/qwaq/ui/curses.h" +#include "ruamoko/qwaq/debugger/debug.h" typedef struct qwaq_target_s { progs_t *pr; diff --git a/ruamoko/qwaq/builtins/editbuffer.c b/ruamoko/qwaq/builtins/editbuffer.c index ab1c161c3..12cde52ab 100644 --- a/ruamoko/qwaq/builtins/editbuffer.c +++ b/ruamoko/qwaq/builtins/editbuffer.c @@ -11,8 +11,8 @@ #include "QF/quakeio.h" #include "QF/txtbuffer.h" -#include "qwaq.h" -#include "editor/editbuffer.h" +#include "ruamoko/qwaq/qwaq.h" +#include "ruamoko/qwaq/editor/editbuffer.h" #define always_inline inline __attribute__((__always_inline__)) diff --git a/ruamoko/qwaq/builtins/input.c b/ruamoko/qwaq/builtins/input.c index 29d5a6088..ce2caec46 100644 --- a/ruamoko/qwaq/builtins/input.c +++ b/ruamoko/qwaq/builtins/input.c @@ -46,9 +46,9 @@ #include "QF/keys.h" #include "QF/sys.h" -#include "qwaq.h" -#include "ui/event.h" -#include "ui/curses.h" +#include "ruamoko/qwaq/qwaq.h" +#include "ruamoko/qwaq/ui/event.h" +#include "ruamoko/qwaq/ui/curses.h" #define always_inline inline __attribute__((__always_inline__)) diff --git a/ruamoko/qwaq/builtins/main.c b/ruamoko/qwaq/builtins/main.c index db4f8da59..da3607c01 100644 --- a/ruamoko/qwaq/builtins/main.c +++ b/ruamoko/qwaq/builtins/main.c @@ -52,8 +52,8 @@ #include "QF/va.h" #include "QF/zone.h" -#include "qwaq.h" -#include "debugger/debug.h" +#include "ruamoko/qwaq/qwaq.h" +#include "ruamoko/qwaq/debugger/debug.h" #define MAX_EDICTS 1024 diff --git a/ruamoko/qwaq/builtins/qwaq-bi.c b/ruamoko/qwaq/builtins/qwaq-bi.c index 82bce4996..602709bdf 100644 --- a/ruamoko/qwaq/builtins/qwaq-bi.c +++ b/ruamoko/qwaq/builtins/qwaq-bi.c @@ -60,7 +60,7 @@ static __attribute__ ((used)) const char rcsid[] = "$Id$"; #include "QF/plugin/console.h" #include "QF/plugin/vid_render.h" -#include "qwaq.h" +#include "ruamoko/qwaq/qwaq.h" CLIENT_PLUGIN_PROTOS static plugin_list_t client_plugin_list[] = { diff --git a/ruamoko/qwaq/builtins/qwaq.c b/ruamoko/qwaq/builtins/qwaq.c index 05d515f4e..111af8764 100644 --- a/ruamoko/qwaq/builtins/qwaq.c +++ b/ruamoko/qwaq/builtins/qwaq.c @@ -46,7 +46,7 @@ #include "QF/va.h" #include "QF/zone.h" -#include "qwaq.h" +#include "ruamoko/qwaq/qwaq.h" #define MAX_EDICTS 1024 diff --git a/ruamoko/qwaq/debugger/debug.h b/ruamoko/qwaq/debugger/debug.h index 6efeb5fb2..f6f58f5ed 100644 --- a/ruamoko/qwaq/debugger/debug.h +++ b/ruamoko/qwaq/debugger/debug.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_debug_h #define __qwaq_debugger_debug_h -#include "ui/event.h" +#include "ruamoko/qwaq/ui/event.h" typedef enum { qe_debug_event = 0x0100, diff --git a/ruamoko/qwaq/debugger/debug.r b/ruamoko/qwaq/debugger/debug.r index 20ccc57b3..feb8adbdd 100644 --- a/ruamoko/qwaq/debugger/debug.r +++ b/ruamoko/qwaq/debugger/debug.r @@ -1,4 +1,4 @@ -#include "debugger/debug.h" +#include "ruamoko/qwaq/debugger/debug.h" void traceon() = #0; void traceoff() = #0; diff --git a/ruamoko/qwaq/debugger/debugger.h b/ruamoko/qwaq/debugger/debugger.h index 13adcf752..9e6c750d2 100644 --- a/ruamoko/qwaq/debugger/debugger.h +++ b/ruamoko/qwaq/debugger/debugger.h @@ -4,8 +4,8 @@ #include #include -#include "debugger/debug.h" -#include "debugger/localsdata.h" +#include "ruamoko/qwaq/debugger/debug.h" +#include "ruamoko/qwaq/debugger/localsdata.h" @class ProxyView; @class Editor; diff --git a/ruamoko/qwaq/debugger/debugger.r b/ruamoko/qwaq/debugger/debugger.r index d46c78ab7..2d51e3c60 100644 --- a/ruamoko/qwaq/debugger/debugger.r +++ b/ruamoko/qwaq/debugger/debugger.r @@ -3,16 +3,16 @@ #include #include -#include "ui/curses.h" -#include "ui/listener.h" -#include "ui/proxyview.h" -#include "ui/scrollbar.h" -#include "ui/tableview.h" -#include "ui/window.h" -#include "debugger/debugger.h" -#include "debugger/typeencodings.h" -#include "editor/editor.h" -#include "qwaq-app.h" +#include "ruamoko/qwaq/ui/curses.h" +#include "ruamoko/qwaq/ui/listener.h" +#include "ruamoko/qwaq/ui/proxyview.h" +#include "ruamoko/qwaq/ui/scrollbar.h" +#include "ruamoko/qwaq/ui/tableview.h" +#include "ruamoko/qwaq/ui/window.h" +#include "ruamoko/qwaq/debugger/debugger.h" +#include "ruamoko/qwaq/debugger/typeencodings.h" +#include "ruamoko/qwaq/editor/editor.h" +#include "ruamoko/qwaq/qwaq-app.h" @implementation Debugger +(Debugger *)withTarget:(qdb_target_t)target diff --git a/ruamoko/qwaq/debugger/localsdata.h b/ruamoko/qwaq/debugger/localsdata.h index 9562921c1..3428219cb 100644 --- a/ruamoko/qwaq/debugger/localsdata.h +++ b/ruamoko/qwaq/debugger/localsdata.h @@ -2,8 +2,8 @@ #define __qwaq_debugger_localsview_h #include -#include "ui/tableview.h" -#include "debugger/debug.h" +#include "ruamoko/qwaq/ui/tableview.h" +#include "ruamoko/qwaq/debugger/debug.h" @interface LocalsData : Object { diff --git a/ruamoko/qwaq/debugger/localsdata.r b/ruamoko/qwaq/debugger/localsdata.r index d65869491..c974cdd98 100644 --- a/ruamoko/qwaq/debugger/localsdata.r +++ b/ruamoko/qwaq/debugger/localsdata.r @@ -1,9 +1,9 @@ #include #include -#include "debugger/views/defview.h" -#include "debugger/views/nameview.h" -#include "debugger/localsdata.h" -#include "debugger/typeencodings.h" +#include "ruamoko/qwaq/debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/nameview.h" +#include "ruamoko/qwaq/debugger/localsdata.h" +#include "ruamoko/qwaq/debugger/typeencodings.h" @implementation LocalsData diff --git a/ruamoko/qwaq/debugger/typeencodings.h b/ruamoko/qwaq/debugger/typeencodings.h index 213dad8a7..11b78d0da 100644 --- a/ruamoko/qwaq/debugger/typeencodings.h +++ b/ruamoko/qwaq/debugger/typeencodings.h @@ -4,7 +4,7 @@ #include #include -#include "debugger/debug.h" +#include "ruamoko/qwaq/debugger/debug.h" @interface TypeEncodings : Object +(qfot_type_t *)getType:(unsigned)typeAddr fromTarget:(qdb_target_t)target; diff --git a/ruamoko/qwaq/debugger/typeencodings.r b/ruamoko/qwaq/debugger/typeencodings.r index ad04dbbcd..7a5fd26d7 100644 --- a/ruamoko/qwaq/debugger/typeencodings.r +++ b/ruamoko/qwaq/debugger/typeencodings.r @@ -1,9 +1,9 @@ #include #include #include -#include // printf FIXME -#include "debugger/typeencodings.h" +#include "ruamoko/qwaq/ui/curses.h" // printf FIXME +#include "ruamoko/qwaq/debugger/typeencodings.h" @implementation TypeEncodings diff --git a/ruamoko/qwaq/debugger/views/basicview.h b/ruamoko/qwaq/debugger/views/basicview.h index d9289889f..d5424c487 100644 --- a/ruamoko/qwaq/debugger/views/basicview.h +++ b/ruamoko/qwaq/debugger/views/basicview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_basicview_h #define __qwaq_debugger_basicview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface BasicView : DefView // might return a NameView (which is also a DefView) diff --git a/ruamoko/qwaq/debugger/views/basicview.r b/ruamoko/qwaq/debugger/views/basicview.r index 8a2067285..96abfc302 100644 --- a/ruamoko/qwaq/debugger/views/basicview.r +++ b/ruamoko/qwaq/debugger/views/basicview.r @@ -1,6 +1,6 @@ #include -#include "debugger/views/basicview.h" -#include "debugger/views/nameview.h" +#include "ruamoko/qwaq/debugger/views/basicview.h" +#include "ruamoko/qwaq/debugger/views/nameview.h" static string type_views[] = { "VoidView", diff --git a/ruamoko/qwaq/debugger/views/defview.h b/ruamoko/qwaq/debugger/views/defview.h index 4760abcad..7e2562104 100644 --- a/ruamoko/qwaq/debugger/views/defview.h +++ b/ruamoko/qwaq/debugger/views/defview.h @@ -2,8 +2,8 @@ #define __qwaq_debugger_defview_h #include -#include "ui/view.h" -#include "debugger/debug.h" +#include "ruamoko/qwaq/ui/view.h" +#include "ruamoko/qwaq/debugger/debug.h" @interface DefView : View { diff --git a/ruamoko/qwaq/debugger/views/defview.r b/ruamoko/qwaq/debugger/views/defview.r index ee681e23e..a972b972f 100644 --- a/ruamoko/qwaq/debugger/views/defview.r +++ b/ruamoko/qwaq/debugger/views/defview.r @@ -1,6 +1,6 @@ #include -#include "debugger/views/defview.h" -#include "debugger/views/nameview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/nameview.h" static string meta_views[] = { "BasicView", diff --git a/ruamoko/qwaq/debugger/views/doubleview.h b/ruamoko/qwaq/debugger/views/doubleview.h index 8fda5ac24..90637ecf3 100644 --- a/ruamoko/qwaq/debugger/views/doubleview.h +++ b/ruamoko/qwaq/debugger/views/doubleview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_doubleview_h #define __qwaq_debugger_doubleview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface DoubleView : DefView { diff --git a/ruamoko/qwaq/debugger/views/doubleview.r b/ruamoko/qwaq/debugger/views/doubleview.r index 36fbfd59d..d94f4e231 100644 --- a/ruamoko/qwaq/debugger/views/doubleview.r +++ b/ruamoko/qwaq/debugger/views/doubleview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/doubleview.h" +#include "ruamoko/qwaq/debugger/views/doubleview.h" @implementation DoubleView diff --git a/ruamoko/qwaq/debugger/views/entityview.h b/ruamoko/qwaq/debugger/views/entityview.h index df8de2c3d..5ad8bd908 100644 --- a/ruamoko/qwaq/debugger/views/entityview.h +++ b/ruamoko/qwaq/debugger/views/entityview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_entityview_h #define __qwaq_debugger_entityview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface EntityView : DefView { diff --git a/ruamoko/qwaq/debugger/views/entityview.r b/ruamoko/qwaq/debugger/views/entityview.r index 49180e914..1170a3f7d 100644 --- a/ruamoko/qwaq/debugger/views/entityview.r +++ b/ruamoko/qwaq/debugger/views/entityview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/entityview.h" +#include "ruamoko/qwaq/debugger/views/entityview.h" @implementation EntityView diff --git a/ruamoko/qwaq/debugger/views/fieldview.h b/ruamoko/qwaq/debugger/views/fieldview.h index 5d90bf77f..0cd314b6b 100644 --- a/ruamoko/qwaq/debugger/views/fieldview.h +++ b/ruamoko/qwaq/debugger/views/fieldview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_fieldview_h #define __qwaq_debugger_fieldview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface FieldView : DefView { diff --git a/ruamoko/qwaq/debugger/views/fieldview.r b/ruamoko/qwaq/debugger/views/fieldview.r index 49bf7282b..f8d1547e3 100644 --- a/ruamoko/qwaq/debugger/views/fieldview.r +++ b/ruamoko/qwaq/debugger/views/fieldview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/fieldview.h" +#include "ruamoko/qwaq/debugger/views/fieldview.h" @implementation FieldView diff --git a/ruamoko/qwaq/debugger/views/floatview.h b/ruamoko/qwaq/debugger/views/floatview.h index a51469709..5c33da88b 100644 --- a/ruamoko/qwaq/debugger/views/floatview.h +++ b/ruamoko/qwaq/debugger/views/floatview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_floatview_h #define __qwaq_debugger_floatview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface FloatView : DefView { diff --git a/ruamoko/qwaq/debugger/views/floatview.r b/ruamoko/qwaq/debugger/views/floatview.r index e98e9e8a8..5b4d534eb 100644 --- a/ruamoko/qwaq/debugger/views/floatview.r +++ b/ruamoko/qwaq/debugger/views/floatview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/floatview.h" +#include "ruamoko/qwaq/debugger/views/floatview.h" @implementation FloatView diff --git a/ruamoko/qwaq/debugger/views/funcview.h b/ruamoko/qwaq/debugger/views/funcview.h index 5a004800c..132812dd3 100644 --- a/ruamoko/qwaq/debugger/views/funcview.h +++ b/ruamoko/qwaq/debugger/views/funcview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_funcview_h #define __qwaq_debugger_funcview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface FuncView : DefView { diff --git a/ruamoko/qwaq/debugger/views/funcview.r b/ruamoko/qwaq/debugger/views/funcview.r index c102bfce1..2fa2218f0 100644 --- a/ruamoko/qwaq/debugger/views/funcview.r +++ b/ruamoko/qwaq/debugger/views/funcview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/funcview.h" +#include "ruamoko/qwaq/debugger/views/funcview.h" @implementation FuncView diff --git a/ruamoko/qwaq/debugger/views/intview.h b/ruamoko/qwaq/debugger/views/intview.h index fddb2f2d5..d2f271b21 100644 --- a/ruamoko/qwaq/debugger/views/intview.h +++ b/ruamoko/qwaq/debugger/views/intview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_intview_h #define __qwaq_debugger_intview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface IntView : DefView { diff --git a/ruamoko/qwaq/debugger/views/intview.r b/ruamoko/qwaq/debugger/views/intview.r index 6caad42ac..a7df120ed 100644 --- a/ruamoko/qwaq/debugger/views/intview.r +++ b/ruamoko/qwaq/debugger/views/intview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/intview.h" +#include "ruamoko/qwaq/debugger/views/intview.h" @implementation IntView diff --git a/ruamoko/qwaq/debugger/views/nameview.h b/ruamoko/qwaq/debugger/views/nameview.h index 7d5838bce..ee5622062 100644 --- a/ruamoko/qwaq/debugger/views/nameview.h +++ b/ruamoko/qwaq/debugger/views/nameview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_nameview_h #define __qwaq_debugger_nameview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface NameView : DefView { diff --git a/ruamoko/qwaq/debugger/views/nameview.r b/ruamoko/qwaq/debugger/views/nameview.r index 9764fedaf..0b66d838e 100644 --- a/ruamoko/qwaq/debugger/views/nameview.r +++ b/ruamoko/qwaq/debugger/views/nameview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/nameview.h" +#include "ruamoko/qwaq/debugger/views/nameview.h" @implementation NameView diff --git a/ruamoko/qwaq/debugger/views/pointerview.h b/ruamoko/qwaq/debugger/views/pointerview.h index 4853958e9..fb45f1ae3 100644 --- a/ruamoko/qwaq/debugger/views/pointerview.h +++ b/ruamoko/qwaq/debugger/views/pointerview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_pointerview_h #define __qwaq_debugger_pointerview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface PointerView : DefView { diff --git a/ruamoko/qwaq/debugger/views/pointerview.r b/ruamoko/qwaq/debugger/views/pointerview.r index 20743ea19..3a000ecf5 100644 --- a/ruamoko/qwaq/debugger/views/pointerview.r +++ b/ruamoko/qwaq/debugger/views/pointerview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/pointerview.h" +#include "ruamoko/qwaq/debugger/views/pointerview.h" @implementation PointerView diff --git a/ruamoko/qwaq/debugger/views/quatview.h b/ruamoko/qwaq/debugger/views/quatview.h index 189a600f8..b88f75811 100644 --- a/ruamoko/qwaq/debugger/views/quatview.h +++ b/ruamoko/qwaq/debugger/views/quatview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_quatview_h #define __qwaq_debugger_quatview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface QuatView : DefView { diff --git a/ruamoko/qwaq/debugger/views/quatview.r b/ruamoko/qwaq/debugger/views/quatview.r index ba98e9d2b..fe8ca0ea1 100644 --- a/ruamoko/qwaq/debugger/views/quatview.r +++ b/ruamoko/qwaq/debugger/views/quatview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/quatview.h" +#include "ruamoko/qwaq/debugger/views/quatview.h" @implementation QuatView diff --git a/ruamoko/qwaq/debugger/views/stringview.h b/ruamoko/qwaq/debugger/views/stringview.h index 5cabaf674..c8a49d131 100644 --- a/ruamoko/qwaq/debugger/views/stringview.h +++ b/ruamoko/qwaq/debugger/views/stringview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_stringview_h #define __qwaq_debugger_stringview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface StringView : DefView { diff --git a/ruamoko/qwaq/debugger/views/stringview.r b/ruamoko/qwaq/debugger/views/stringview.r index 79ef75212..d686fd636 100644 --- a/ruamoko/qwaq/debugger/views/stringview.r +++ b/ruamoko/qwaq/debugger/views/stringview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/stringview.h" +#include "ruamoko/qwaq/debugger/views/stringview.h" @implementation StringView diff --git a/ruamoko/qwaq/debugger/views/uintview.h b/ruamoko/qwaq/debugger/views/uintview.h index 9597c5519..5211b2ff7 100644 --- a/ruamoko/qwaq/debugger/views/uintview.h +++ b/ruamoko/qwaq/debugger/views/uintview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_uintview_h #define __qwaq_debugger_uintview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface UIntView : DefView { diff --git a/ruamoko/qwaq/debugger/views/uintview.r b/ruamoko/qwaq/debugger/views/uintview.r index e06ac32fa..c80b9b517 100644 --- a/ruamoko/qwaq/debugger/views/uintview.r +++ b/ruamoko/qwaq/debugger/views/uintview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/uintview.h" +#include "ruamoko/qwaq/debugger/views/uintview.h" @implementation UIntView diff --git a/ruamoko/qwaq/debugger/views/vectorview.h b/ruamoko/qwaq/debugger/views/vectorview.h index b6b95fa34..2a00c4e39 100644 --- a/ruamoko/qwaq/debugger/views/vectorview.h +++ b/ruamoko/qwaq/debugger/views/vectorview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_vectorview_h #define __qwaq_debugger_vectorview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface VectorView : DefView { diff --git a/ruamoko/qwaq/debugger/views/vectorview.r b/ruamoko/qwaq/debugger/views/vectorview.r index 2fa8b41ed..61a50c6af 100644 --- a/ruamoko/qwaq/debugger/views/vectorview.r +++ b/ruamoko/qwaq/debugger/views/vectorview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/vectorview.h" +#include "ruamoko/qwaq/debugger/views/vectorview.h" @implementation VectorView diff --git a/ruamoko/qwaq/debugger/views/voidview.h b/ruamoko/qwaq/debugger/views/voidview.h index 6232968e0..1c6655bb1 100644 --- a/ruamoko/qwaq/debugger/views/voidview.h +++ b/ruamoko/qwaq/debugger/views/voidview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_debugger_voidview_h #define __qwaq_debugger_voidview_h -#include "debugger/views/defview.h" +#include "ruamoko/qwaq/debugger/views/defview.h" @interface VoidView : DefView { diff --git a/ruamoko/qwaq/debugger/views/voidview.r b/ruamoko/qwaq/debugger/views/voidview.r index 440edece2..81e58b62c 100644 --- a/ruamoko/qwaq/debugger/views/voidview.r +++ b/ruamoko/qwaq/debugger/views/voidview.r @@ -1,5 +1,5 @@ #include -#include "debugger/views/voidview.h" +#include "ruamoko/qwaq/debugger/views/voidview.h" @implementation VoidView diff --git a/ruamoko/qwaq/editor/editbuffer.r b/ruamoko/qwaq/editor/editbuffer.r index 9a6da8396..cd7644f7d 100644 --- a/ruamoko/qwaq/editor/editbuffer.r +++ b/ruamoko/qwaq/editor/editbuffer.r @@ -1,4 +1,4 @@ -#include "editor/editbuffer.h" +#include "ruamoko/qwaq/editor/editbuffer.h" @implementation EditBuffer +(EditBuffer *)buffer diff --git a/ruamoko/qwaq/editor/editor.h b/ruamoko/qwaq/editor/editor.h index b5bd4b7d5..cd04f8a8e 100644 --- a/ruamoko/qwaq/editor/editor.h +++ b/ruamoko/qwaq/editor/editor.h @@ -1,8 +1,8 @@ #ifndef __qwaq_editor_editor_h #define __qwaq_editor_editor_h -#include "editor/editbuffer.h" -#include "ui/view.h" +#include "ruamoko/qwaq/editor/editbuffer.h" +#include "ruamoko/qwaq/ui/view.h" @class Editor; @class EditBuffer; diff --git a/ruamoko/qwaq/editor/editor.r b/ruamoko/qwaq/editor/editor.r index 8dd64c21d..62158dfe9 100644 --- a/ruamoko/qwaq/editor/editor.r +++ b/ruamoko/qwaq/editor/editor.r @@ -1,9 +1,9 @@ #include #include -#include "qwaq-app.h" -#include "editor/editor.h" -#include "ui/listener.h" -#include "ui/scrollbar.h" +#include "ruamoko/qwaq/qwaq-app.h" +#include "ruamoko/qwaq/editor/editor.h" +#include "ruamoko/qwaq/ui/listener.h" +#include "ruamoko/qwaq/ui/scrollbar.h" @implementation Editor diff --git a/ruamoko/qwaq/qwaq-app.h b/ruamoko/qwaq/qwaq-app.h index bf6255740..a35cee787 100644 --- a/ruamoko/qwaq/qwaq-app.h +++ b/ruamoko/qwaq/qwaq-app.h @@ -3,8 +3,8 @@ #include -#include "ui/event.h" -#include "ui/rect.h" +#include "ruamoko/qwaq/ui/event.h" +#include "ruamoko/qwaq/ui/rect.h" @class Array; @class Group; diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r index e98f4d03f..9520cf67e 100644 --- a/ruamoko/qwaq/qwaq-app.r +++ b/ruamoko/qwaq/qwaq-app.r @@ -3,12 +3,12 @@ int fence; #include #include -#include "ui/color.h" -#include "ui/curses.h" -#include "ui/group.h" -#include "ui/view.h" -#include "debugger/debugger.h" -#include "qwaq-app.h" +#include "ruamoko/qwaq/ui/color.h" +#include "ruamoko/qwaq/ui/curses.h" +#include "ruamoko/qwaq/ui/group.h" +#include "ruamoko/qwaq/ui/view.h" +#include "ruamoko/qwaq/debugger/debugger.h" +#include "ruamoko/qwaq/qwaq-app.h" int color_palette[64]; diff --git a/ruamoko/qwaq/ui/button.h b/ruamoko/qwaq/ui/button.h index 8db47b4f8..7fc2e9716 100644 --- a/ruamoko/qwaq/ui/button.h +++ b/ruamoko/qwaq/ui/button.h @@ -1,8 +1,8 @@ #ifndef __qwaq_ui_button_h #define __qwaq_ui_button_h -#include "ui/draw.h" -#include "ui/view.h" +#include "ruamoko/qwaq/ui/draw.h" +#include "ruamoko/qwaq/ui/view.h" @class ListenerGroup; diff --git a/ruamoko/qwaq/ui/button.r b/ruamoko/qwaq/ui/button.r index f2951d2f2..7f42fb3e4 100644 --- a/ruamoko/qwaq/ui/button.r +++ b/ruamoko/qwaq/ui/button.r @@ -1,5 +1,5 @@ -#include "ui/button.h" -#include "ui/listener.h" +#include "ruamoko/qwaq/ui/button.h" +#include "ruamoko/qwaq/ui/listener.h" @implementation Button diff --git a/ruamoko/qwaq/ui/curses.h b/ruamoko/qwaq/ui/curses.h index 1849a6440..f3038365e 100644 --- a/ruamoko/qwaq/ui/curses.h +++ b/ruamoko/qwaq/ui/curses.h @@ -1,7 +1,7 @@ #ifndef __qwaq_ui_curses_h #define __qwaq_ui_curses_h -#include "ui/event.h" +#include "ruamoko/qwaq/ui/event.h" typedef struct box_sides_s { int ls; @@ -18,7 +18,7 @@ typedef struct box_corners_s { } box_corners_t; #ifdef __QFCC__ -#include "ui/rect.h" +#include "ruamoko/qwaq/ui/rect.h" // names, order and comments lifted from ncurses.h typedef enum { diff --git a/ruamoko/qwaq/ui/draw.h b/ruamoko/qwaq/ui/draw.h index eb7379fe4..e9a9e44b5 100644 --- a/ruamoko/qwaq/ui/draw.h +++ b/ruamoko/qwaq/ui/draw.h @@ -3,7 +3,7 @@ #include -#include "ui/rect.h" +#include "ruamoko/qwaq/ui/rect.h" @class DrawBuffer; diff --git a/ruamoko/qwaq/ui/draw.r b/ruamoko/qwaq/ui/draw.r index ebb75fcbd..aeaa00475 100644 --- a/ruamoko/qwaq/ui/draw.r +++ b/ruamoko/qwaq/ui/draw.r @@ -1,7 +1,7 @@ #include -#include "ui/curses.h" -#include "ui/draw.h" +#include "ruamoko/qwaq/ui/curses.h" +#include "ruamoko/qwaq/ui/draw.h" @implementation DrawBuffer diff --git a/ruamoko/qwaq/ui/garray.r b/ruamoko/qwaq/ui/garray.r index ee6bd0191..55aa35e88 100644 --- a/ruamoko/qwaq/ui/garray.r +++ b/ruamoko/qwaq/ui/garray.r @@ -1,6 +1,6 @@ #include -#include "ui/event.h" -#include "ui/garray.h" +#include "ruamoko/qwaq/ui/event.h" +#include "ruamoko/qwaq/ui/garray.h" @implementation Array (Group) - (void) makeObjectsPerformSelector: (SEL)selector diff --git a/ruamoko/qwaq/ui/group.h b/ruamoko/qwaq/ui/group.h index 071ee53f0..c1b96b80d 100644 --- a/ruamoko/qwaq/ui/group.h +++ b/ruamoko/qwaq/ui/group.h @@ -3,8 +3,8 @@ #include -#include "ui/event.h" -#include "ui/draw.h" +#include "ruamoko/qwaq/ui/event.h" +#include "ruamoko/qwaq/ui/draw.h" @class View; diff --git a/ruamoko/qwaq/ui/group.r b/ruamoko/qwaq/ui/group.r index 8bbca6d9b..e2e8e1890 100644 --- a/ruamoko/qwaq/ui/group.r +++ b/ruamoko/qwaq/ui/group.r @@ -1,9 +1,9 @@ #include -#include "ui/event.h" -#include "ui/draw.h" -#include "ui/garray.h" -#include "ui/group.h" -#include "ui/view.h" +#include "ruamoko/qwaq/ui/event.h" +#include "ruamoko/qwaq/ui/draw.h" +#include "ruamoko/qwaq/ui/garray.h" +#include "ruamoko/qwaq/ui/group.h" +#include "ruamoko/qwaq/ui/view.h" @implementation Group diff --git a/ruamoko/qwaq/ui/listener.r b/ruamoko/qwaq/ui/listener.r index 31dd001fa..8fa43b01f 100644 --- a/ruamoko/qwaq/ui/listener.r +++ b/ruamoko/qwaq/ui/listener.r @@ -1,7 +1,7 @@ #include -#include "ui/listener.h" -#include "ui/curses.h" +#include "ruamoko/qwaq/ui/listener.h" +#include "ruamoko/qwaq/ui/curses.h" @class Array; diff --git a/ruamoko/qwaq/ui/proxyview.h b/ruamoko/qwaq/ui/proxyview.h index d19a47ef0..c7d062cdc 100644 --- a/ruamoko/qwaq/ui/proxyview.h +++ b/ruamoko/qwaq/ui/proxyview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_ui_proxyview_h #define __qwaq_ui_proxyview_h -#include "ui/view.h" +#include "ruamoko/qwaq/ui/view.h" @class Group; diff --git a/ruamoko/qwaq/ui/proxyview.r b/ruamoko/qwaq/ui/proxyview.r index 71a85e36d..714b3fd9d 100644 --- a/ruamoko/qwaq/ui/proxyview.r +++ b/ruamoko/qwaq/ui/proxyview.r @@ -1,5 +1,5 @@ -#include "ui/group.h" -#include "ui/proxyview.h" +#include "ruamoko/qwaq/ui/group.h" +#include "ruamoko/qwaq/ui/proxyview.h" @implementation ProxyView +(ProxyView *)withView:(View *)view diff --git a/ruamoko/qwaq/ui/rect.r b/ruamoko/qwaq/ui/rect.r index f2a51cf8d..905ee0385 100644 --- a/ruamoko/qwaq/ui/rect.r +++ b/ruamoko/qwaq/ui/rect.r @@ -1,4 +1,4 @@ -#include "ui/rect.h" +#include "ruamoko/qwaq/ui/rect.h" Rect clipRect (Rect clipRect, Rect rect) diff --git a/ruamoko/qwaq/ui/scrollbar.h b/ruamoko/qwaq/ui/scrollbar.h index 986646878..404dbfaf7 100644 --- a/ruamoko/qwaq/ui/scrollbar.h +++ b/ruamoko/qwaq/ui/scrollbar.h @@ -1,7 +1,7 @@ #ifndef __qwaq_ui_scrollbar_h #define __qwaq_ui_scrollbar_h -#include "ui/view.h" +#include "ruamoko/qwaq/ui/view.h" @class Button; @class DrawBuffer; diff --git a/ruamoko/qwaq/ui/scrollbar.r b/ruamoko/qwaq/ui/scrollbar.r index b8b005aa8..3d0eee6ce 100644 --- a/ruamoko/qwaq/ui/scrollbar.r +++ b/ruamoko/qwaq/ui/scrollbar.r @@ -1,7 +1,7 @@ -#include "ui/button.h" -#include "ui/group.h" -#include "ui/listener.h" -#include "ui/scrollbar.h" +#include "ruamoko/qwaq/ui/button.h" +#include "ruamoko/qwaq/ui/group.h" +#include "ruamoko/qwaq/ui/listener.h" +#include "ruamoko/qwaq/ui/scrollbar.h" @implementation ScrollBar diff --git a/ruamoko/qwaq/ui/tableview.h b/ruamoko/qwaq/ui/tableview.h index 9a6233333..52bca6880 100644 --- a/ruamoko/qwaq/ui/tableview.h +++ b/ruamoko/qwaq/ui/tableview.h @@ -1,7 +1,7 @@ #ifndef __qwaq_ui_tableview_h #define __qwaq_ui_tableview_h -#include "ui/view.h" +#include "ruamoko/qwaq/ui/view.h" @class DrawBuffer; @class TableView; diff --git a/ruamoko/qwaq/ui/tableview.r b/ruamoko/qwaq/ui/tableview.r index cb1a3f94c..940bf1793 100644 --- a/ruamoko/qwaq/ui/tableview.r +++ b/ruamoko/qwaq/ui/tableview.r @@ -1,6 +1,6 @@ #include -#include "ui/listener.h" -#include "ui/tableview.h" +#include "ruamoko/qwaq/ui/listener.h" +#include "ruamoko/qwaq/ui/tableview.h" @implementation TableViewColumn -initWithName:(string)name width:(int)width diff --git a/ruamoko/qwaq/ui/textcontext.h b/ruamoko/qwaq/ui/textcontext.h index 2369dfeee..21f21b5ae 100644 --- a/ruamoko/qwaq/ui/textcontext.h +++ b/ruamoko/qwaq/ui/textcontext.h @@ -3,9 +3,9 @@ #ifdef __QFCC__ #include -#include "ui/curses.h" -#include "ui/draw.h" -#include "ui/rect.h" +#include "ruamoko/qwaq/ui/curses.h" +#include "ruamoko/qwaq/ui/draw.h" +#include "ruamoko/qwaq/ui/rect.h" @class DrawBuffer; diff --git a/ruamoko/qwaq/ui/textcontext.r b/ruamoko/qwaq/ui/textcontext.r index bbe7a9476..9d05765d7 100644 --- a/ruamoko/qwaq/ui/textcontext.r +++ b/ruamoko/qwaq/ui/textcontext.r @@ -1,5 +1,5 @@ -#include "ui/draw.h" -#include "ui/textcontext.h" +#include "ruamoko/qwaq/ui/draw.h" +#include "ruamoko/qwaq/ui/textcontext.h" @implementation TextContext + (int) is_initialized = #0; diff --git a/ruamoko/qwaq/ui/titlebar.h b/ruamoko/qwaq/ui/titlebar.h index e71a41a25..a3290a20d 100644 --- a/ruamoko/qwaq/ui/titlebar.h +++ b/ruamoko/qwaq/ui/titlebar.h @@ -1,7 +1,7 @@ #ifndef __qwaq_ui_titlebar_h #define __qwaq_ui_titlebar_h -#include "ui/view.h" +#include "ruamoko/qwaq/ui/view.h" @interface TitleBar : View { diff --git a/ruamoko/qwaq/ui/titlebar.r b/ruamoko/qwaq/ui/titlebar.r index db1f717de..d6634c2ad 100644 --- a/ruamoko/qwaq/ui/titlebar.r +++ b/ruamoko/qwaq/ui/titlebar.r @@ -1,7 +1,7 @@ #include -#include "ui/group.h" -#include "ui/titlebar.h" +#include "ruamoko/qwaq/ui/group.h" +#include "ruamoko/qwaq/ui/titlebar.h" @implementation TitleBar diff --git a/ruamoko/qwaq/ui/view.h b/ruamoko/qwaq/ui/view.h index e0da51a28..15e8d22d3 100644 --- a/ruamoko/qwaq/ui/view.h +++ b/ruamoko/qwaq/ui/view.h @@ -4,9 +4,9 @@ #include #include -#include "ui/draw.h" -#include "ui/rect.h" -#include "ui/textcontext.h" +#include "ruamoko/qwaq/ui/draw.h" +#include "ruamoko/qwaq/ui/rect.h" +#include "ruamoko/qwaq/ui/textcontext.h" @class Group; @class ListenerGroup; diff --git a/ruamoko/qwaq/ui/view.r b/ruamoko/qwaq/ui/view.r index 579f804c1..014560ffd 100644 --- a/ruamoko/qwaq/ui/view.r +++ b/ruamoko/qwaq/ui/view.r @@ -1,8 +1,8 @@ -#include "ui/curses.h" -#include "ui/listener.h" -#include "ui/group.h" -#include "ui/scrollbar.h" -#include "ui/view.h" +#include "ruamoko/qwaq/ui/curses.h" +#include "ruamoko/qwaq/ui/listener.h" +#include "ruamoko/qwaq/ui/group.h" +#include "ruamoko/qwaq/ui/scrollbar.h" +#include "ruamoko/qwaq/ui/view.h" @implementation View diff --git a/ruamoko/qwaq/ui/window.h b/ruamoko/qwaq/ui/window.h index 67a0608e2..8464a68ee 100644 --- a/ruamoko/qwaq/ui/window.h +++ b/ruamoko/qwaq/ui/window.h @@ -7,9 +7,9 @@ @class Button; @class TitleBar; -#include "ui/draw.h" -#include "ui/rect.h" -#include "ui/view.h" +#include "ruamoko/qwaq/ui/draw.h" +#include "ruamoko/qwaq/ui/rect.h" +#include "ruamoko/qwaq/ui/view.h" @interface Window: View { diff --git a/ruamoko/qwaq/ui/window.r b/ruamoko/qwaq/ui/window.r index ea966d473..54dc574d6 100644 --- a/ruamoko/qwaq/ui/window.r +++ b/ruamoko/qwaq/ui/window.r @@ -1,14 +1,14 @@ #include #include -#include "ui/event.h" -#include "ui/button.h" -#include "ui/curses.h" -#include "ui/group.h" -#include "ui/listener.h" -#include "ui/titlebar.h" -#include "ui/window.h" -#include "ui/view.h" +#include "ruamoko/qwaq/ui/event.h" +#include "ruamoko/qwaq/ui/button.h" +#include "ruamoko/qwaq/ui/curses.h" +#include "ruamoko/qwaq/ui/group.h" +#include "ruamoko/qwaq/ui/listener.h" +#include "ruamoko/qwaq/ui/titlebar.h" +#include "ruamoko/qwaq/ui/window.h" +#include "ruamoko/qwaq/ui/view.h" @implementation Window diff --git a/ruamoko/scheme/Makefile.am b/ruamoko/scheme/Makefile.am deleted file mode 100644 index 9a5fb71a8..000000000 --- a/ruamoko/scheme/Makefile.am +++ /dev/null @@ -1,81 +0,0 @@ -AUTOMAKE_OPTIONS= foreign no-exeext - -QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) -QFCC=$(QFCC_DEP) - -GZ=@progs_gz@ -scheme_libs=libscheme.a -scheme_libexec=main.dat - -pkglibdir=$(datarootdir)/qfcc/lib -#FIXME where to put pkglibexec? -#pkglibexecdir=$(datarootdir)/qfcc/bin - -pkglib_LIBRARIES= $(scheme_libs) -EXTRA_LIBRARIES= $(scheme_libs) - -noinst_PROGRAMS= $(scheme_libexec) -EXTRA_PROGRAMS = $(scheme_libexec) - -QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide -QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -QCLINKFLAGS=--no-default-paths -L$(top_builddir)/ruamoko/lib -QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -QLINK=$(QFCC) $(QCFLAGS) $(QCLINKFLAGS) - -MKDIR_P = @MKDIR_P@ -am__mv = mv -f - -PAK=$(top_builddir)/tools/pak/pak$(EXEEXT) -GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi -# BSD make can't handle $(shell foo) directives, and GNU make can't handle |= -# so we have to bite the bullet and pass this to the shell every time. -RANLIB=touch - -SUFFIXES=.o .r -.r.o: - $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $< - @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo - @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo - -r_depfiles_remade= - -libscheme_a_SOURCES=\ - SchemeObject.r Cons.r Number.r SchemeString.r Symbol.r Lexer.r Parser.r \ - Nil.r Procedure.r Primitive.r Lambda.r Scope.r Instruction.r builtins.r \ - Frame.r CompiledCode.r Compiler.r Continuation.r Machine.r Void.r \ - Error.r Boolean.r BaseContinuation.r -libscheme_a_obj=$(libscheme_a_SOURCES:.r=.o) -libscheme_a_dep=$(addprefix ./$(DEPDIR)/,$(libscheme_a_obj:.o=.Qo)) -libscheme_a_AR=$(PAK) -cf -include $(libscheme_a_dep) # am--include-marker -r_depfiles_remade += $(libscheme_a_dep) - -scheme_src=\ - main.r defs.r - -main_dat_SOURCES=$(scheme_src) -main_obj=$(scheme_src:.r=.o) -main_dep=$(addprefix ./$(DEPDIR)/,$(main_obj:.o=.Qo)) -main.dat: $(main_obj) $(QFCC_DEP) libscheme.a ../lib/libcsqc.a ../lib/libr.a - $(QLINK) -o main.dat $(main_obj) libscheme.a ../lib/libcsqc.a ../lib/libr.a -include $(main_dep) # am--include-marker -r_depfiles_remade += $(main_dep) - -main.sym: main.dat - -$(r_depfiles_remade): - $(MKDIR_P) $(@D) - echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) - -EXTRA_DIST = \ - BaseContinuation.h Boolean.h CompiledCode.h Compiler.h Cons.h \ - Continuation.h Error.h Frame.h Instruction.h Lambda.h Lexer.h \ - Machine.h Nil.h Number.h Parser.h Primitive.h Procedure.h \ - SchemeObject.h SchemeString.h Scope.h Symbol.h Void.h builtins.h \ - debug.h defs.h state.h \ - \ - main.r defs.r -CLEANFILES= *.dat *.sym *.gz *.qfo *.o diff --git a/ruamoko/scheme/Makemodule.am b/ruamoko/scheme/Makemodule.am new file mode 100644 index 000000000..b3fcfb5d9 --- /dev/null +++ b/ruamoko/scheme/Makemodule.am @@ -0,0 +1,88 @@ +ruamoko_scheme_libs=ruamoko/scheme/libscheme.a +ruamoko_scheme_libexec=ruamoko/scheme/main.dat$(EXEEXT) + +ruamoko_lib_LIBRARIES += $(ruamoko_scheme_libs) +EXTRA_LIBRARIES += $(ruamoko_scheme_libs) + +noinst_PROGRAMS += $(ruamoko_scheme_libexec) +EXTRA_PROGRAMS += $(ruamoko_scheme_libexec) + +ruamoko_scheme_libscheme_a_SOURCES=\ + ruamoko/scheme/SchemeObject.r \ + ruamoko/scheme/Cons.r \ + ruamoko/scheme/Number.r \ + ruamoko/scheme/SchemeString.r \ + ruamoko/scheme/Symbol.r \ + ruamoko/scheme/Lexer.r \ + ruamoko/scheme/Parser.r \ + ruamoko/scheme/Nil.r \ + ruamoko/scheme/Procedure.r \ + ruamoko/scheme/Primitive.r \ + ruamoko/scheme/Lambda.r \ + ruamoko/scheme/Scope.r \ + ruamoko/scheme/Instruction.r \ + ruamoko/scheme/builtins.r \ + ruamoko/scheme/Frame.r \ + ruamoko/scheme/CompiledCode.r \ + ruamoko/scheme/Compiler.r \ + ruamoko/scheme/Continuation.r \ + ruamoko/scheme/Machine.r \ + ruamoko/scheme/Void.r \ + ruamoko/scheme/Error.r \ + ruamoko/scheme/Boolean.r \ + ruamoko/scheme/BaseContinuation.r +ruamoko_scheme_libscheme_a_dep=$(call qcautodep,$(ruamoko_scheme_libscheme_a_SOURCES)) +ruamoko_scheme_libscheme_a_AR=$(PAK) -cf +EXTRA_ruamoko_scheme_libscheme_a_DEPENDENCIES=pak +include $(ruamoko_scheme_libscheme_a_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_scheme_libscheme_a_dep) + +ruamoko_scheme_src=\ + ruamoko/scheme/main.r \ + ruamoko/scheme/defs.r + +ruamoko_scheme_main_dat_SOURCES=$(ruamoko_scheme_src) +ruamoko_scheme_main_obj=$(ruamoko_scheme_main_dat_SOURCES:.r=.o) +ruamoko_scheme_main_dep=$(call qcautodep,$(ruamoko_scheme_main_dat_SOURCES)) +ruamoko/scheme/main.dat$(EXEEXT): $(ruamoko_scheme_main_obj) $(QFCC_DEP) ruamoko/scheme/libscheme.a ruamoko/lib/libcsqc.a ruamoko/lib/libr.a + $(QLINK) -o $@ $(ruamoko_scheme_main_obj) -Lruamoko/scheme -lscheme -lcsqc -lr +include $(ruamoko_scheme_main_dep) # am--include-marker +r_depfiles_remade += $(ruamoko_scheme_main_dep) + +ruamoko/scheme/main.sym: ruamoko/scheme/main.dat$(EXEEXT) + +EXTRA_DIST += \ + ruamoko/scheme/BaseContinuation.h \ + ruamoko/scheme/Boolean.h \ + ruamoko/scheme/CompiledCode.h \ + ruamoko/scheme/Compiler.h \ + ruamoko/scheme/Cons.h \ + ruamoko/scheme/Continuation.h \ + ruamoko/scheme/Error.h \ + ruamoko/scheme/Frame.h \ + ruamoko/scheme/Instruction.h \ + ruamoko/scheme/Lambda.h \ + ruamoko/scheme/Lexer.h \ + ruamoko/scheme/Machine.h \ + ruamoko/scheme/Nil.h \ + ruamoko/scheme/Number.h \ + ruamoko/scheme/Parser.h \ + ruamoko/scheme/Primitive.h \ + ruamoko/scheme/Procedure.h \ + ruamoko/scheme/SchemeObject.h \ + ruamoko/scheme/SchemeString.h \ + ruamoko/scheme/Scope.h \ + ruamoko/scheme/Symbol.h \ + ruamoko/scheme/Void.h \ + ruamoko/scheme/builtins.h \ + ruamoko/scheme/debug.h \ + ruamoko/scheme/defs.h \ + ruamoko/scheme/state.h \ + ruamoko/scheme/main.r \ + ruamoko/scheme/defs.r +CLEANFILES += \ + ruamoko/scheme/*.dat \ + ruamoko/scheme/*.sym +DISTCLEANFILES += \ + $(ruamoko_scheme_libscheme_a_dep) \ + $(ruamoko_scheme_main_dep) diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 768efdccb..000000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -SUBDIRS=@tools_dirs@ -DIST_SUBDIRS=bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav -EXTRA_DIST= \ - io_mesh_qfmdl/export_mdl.py io_mesh_qfmdl/import_mdl.py \ - io_mesh_qfmdl/__init__.py io_mesh_qfmdl/mdl.py io_mesh_qfmdl/qfplist.py \ - io_mesh_qfmdl/quakepal.py diff --git a/tools/Makemodule.am b/tools/Makemodule.am new file mode 100644 index 000000000..7a3805526 --- /dev/null +++ b/tools/Makemodule.am @@ -0,0 +1,20 @@ +include tools/bsp2img/Makemodule.am +include tools/carne/Makemodule.am +include tools/pak/Makemodule.am +include tools/qfbsp/Makemodule.am +include tools/qfcc/Makemodule.am +include tools/qflight/Makemodule.am +include tools/qflmp/Makemodule.am +include tools/qfmodelgen/Makemodule.am +include tools/qfspritegen/Makemodule.am +include tools/qfvis/Makemodule.am +include tools/wad/Makemodule.am +include tools/wav/Makemodule.am + +EXTRA_DIST += \ + tools/io_mesh_qfmdl/export_mdl.py \ + tools/io_mesh_qfmdl/import_mdl.py \ + tools/io_mesh_qfmdl/__init__.py \ + tools/io_mesh_qfmdl/mdl.py \ + tools/io_mesh_qfmdl/qfplist.py \ + tools/io_mesh_qfmdl/quakepal.py diff --git a/tools/bsp2img/Makefile.am b/tools/bsp2img/Makemodule.am similarity index 60% rename from tools/bsp2img/Makefile.am rename to tools/bsp2img/Makemodule.am index ceaeca266..bf58c14aa 100644 --- a/tools/bsp2img/Makefile.am +++ b/tools/bsp2img/Makemodule.am @@ -2,10 +2,8 @@ BSP2IMG_LIBS=@BSP2IMG_LIBS@ BSP2IMG_DEPS=@BSP2IMG_DEPS@ BSP2IMG_INCS=@BSP2IMG_INCS@ -AM_CPPFLAGS= -I$(top_srcdir)/include $(BSP2IMG_INCS) +bin_PROGRAMS += bsp2img -bin_PROGRAMS=bsp2img - -bsp2img_SOURCES= bsp2img.c +bsp2img_SOURCES= tools/bsp2img/bsp2img.c bsp2img_LDADD= $(BSP2IMG_LIBS) bsp2img_DEPENDENCIES= $(BSP2IMG_DEPS) diff --git a/tools/carne/Makefile.am b/tools/carne/Makefile.am deleted file mode 100644 index bec57857d..000000000 --- a/tools/carne/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -CARNE_LIBS=@CARNE_LIBS@ -CARNE_DEPS=@CARNE_DEPS@ -PAK_INCS=@CARNE_INCS@ - -AM_CPPFLAGS= -I$(top_srcdir)/include $(CARNE_INCS) - -noinst_PROGRAMS= carne - -carne_SOURCES= main.c -carne_LDADD= $(CARNE_LIBS) -carne_DEPENDENCIES= $(CARNE_DEPS) diff --git a/tools/carne/Makemodule.am b/tools/carne/Makemodule.am new file mode 100644 index 000000000..24f5f056b --- /dev/null +++ b/tools/carne/Makemodule.am @@ -0,0 +1,8 @@ +CARNE_LIBS=@CARNE_LIBS@ +CARNE_DEPS=@CARNE_DEPS@ + +noinst_PROGRAMS += carne + +carne_SOURCES= tools/carne/main.c +carne_LDADD= $(CARNE_LIBS) +carne_DEPENDENCIES= $(CARNE_DEPS) diff --git a/tools/pak/Makefile.am b/tools/pak/Makefile.am deleted file mode 100644 index 5461c399e..000000000 --- a/tools/pak/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -PAK_LIBS=@PAK_LIBS@ -PAK_DEPS=@PAK_DEPS@ -PAK_INCS=@PAK_INCS@ - -AM_CPPFLAGS= -I$(top_srcdir)/include $(PAK_INCS) - -bin_PROGRAMS= pak -bin_SCRIPTS= zpak - -mans= pak.1 zpak.1 -man_MANS= $(mans) - -pak_SOURCES= pak.c -pak_LDADD= $(PAK_LIBS) -pak_DEPENDENCIES= $(PAK_DEPS) - -EXTRA_DIST=pak.h zpak $(mans) diff --git a/tools/pak/Makemodule.am b/tools/pak/Makemodule.am new file mode 100644 index 000000000..d7a247e88 --- /dev/null +++ b/tools/pak/Makemodule.am @@ -0,0 +1,14 @@ +PAK_LIBS=@PAK_LIBS@ +PAK_DEPS=@PAK_DEPS@ +PAK_INCS=@PAK_INCS@ + +bin_PROGRAMS += pak +bin_SCRIPTS += tools/pak/zpak + +man_MANS += tools/pak/pak.1 tools/pak/zpak.1 + +pak_SOURCES= tools/pak/pak.c +pak_LDADD= $(PAK_LIBS) +pak_DEPENDENCIES= $(PAK_DEPS) + +EXTRA_DIST += tools/pak/pak.h tools/pak/zpak $(man_MANS) diff --git a/tools/qfbsp/Makefile.am b/tools/qfbsp/Makefile.am deleted file mode 100644 index f2bd807e0..000000000 --- a/tools/qfbsp/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= include source diff --git a/tools/qfbsp/Makemodule.am b/tools/qfbsp/Makemodule.am new file mode 100644 index 000000000..c73468397 --- /dev/null +++ b/tools/qfbsp/Makemodule.am @@ -0,0 +1,2 @@ +include tools/qfbsp/include/Makemodule.am +include tools/qfbsp/source/Makemodule.am diff --git a/tools/qfbsp/include/Makefile.am b/tools/qfbsp/include/Makefile.am deleted file mode 100644 index d4ab30d4e..000000000 --- a/tools/qfbsp/include/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -EXTRA_DIST= brush.h bsp5.h csg4.h draw.h map.h merge.h options.h outside.h \ - portals.h readbsp.h region.h solidbsp.h surfaces.h tjunc.h \ - writebsp.h diff --git a/tools/qfbsp/include/Makemodule.am b/tools/qfbsp/include/Makemodule.am new file mode 100644 index 000000000..0cf8e31dd --- /dev/null +++ b/tools/qfbsp/include/Makemodule.am @@ -0,0 +1,16 @@ +EXTRA_DIST += \ + tools/qfbsp/include/brush.h \ + tools/qfbsp/include/bsp5.h \ + tools/qfbsp/include/csg4.h \ + tools/qfbsp/include/draw.h \ + tools/qfbsp/include/map.h \ + tools/qfbsp/include/merge.h \ + tools/qfbsp/include/options.h \ + tools/qfbsp/include/outside.h \ + tools/qfbsp/include/portals.h \ + tools/qfbsp/include/readbsp.h \ + tools/qfbsp/include/region.h \ + tools/qfbsp/include/solidbsp.h \ + tools/qfbsp/include/surfaces.h \ + tools/qfbsp/include/tjunc.h \ + tools/qfbsp/include/writebsp.h diff --git a/tools/qfbsp/source/Makefile.am b/tools/qfbsp/source/Makefile.am deleted file mode 100644 index 8fd7f660b..000000000 --- a/tools/qfbsp/source/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -QFBSP_LIBS=@QFBSP_LIBS@ -QFBSP_DEPS=@QFBSP_DEPS@ -QFBSP_INCS=@QFBSP_INCS@ - -AM_CPPFLAGS= -I$(top_srcdir)/include $(QFBSP_INCS) - -bin_PROGRAMS= qfbsp - -qfbsp_SOURCES= \ - brush.c csg4.c map.c merge.c nodraw.c options.c outside.c portals.c \ - qfbsp.c readbsp.c region.c solidbsp.c surfaces.c tjunc.c writebsp.c - -qfbsp_LDADD= $(QFBSP_LIBS) -qfbsp_DEPENDENCIES= $(QFBSP_DEPS) diff --git a/tools/qfbsp/source/Makemodule.am b/tools/qfbsp/source/Makemodule.am new file mode 100644 index 000000000..2e3e9a524 --- /dev/null +++ b/tools/qfbsp/source/Makemodule.am @@ -0,0 +1,25 @@ +QFBSP_LIBS=@QFBSP_LIBS@ +QFBSP_DEPS=@QFBSP_DEPS@ +QFBSP_INCS=@QFBSP_INCS@ + +bin_PROGRAMS += qfbsp + +qfbsp_SOURCES= \ + tools/qfbsp/source/brush.c \ + tools/qfbsp/source/csg4.c \ + tools/qfbsp/source/map.c \ + tools/qfbsp/source/merge.c \ + tools/qfbsp/source/nodraw.c \ + tools/qfbsp/source/options.c \ + tools/qfbsp/source/outside.c \ + tools/qfbsp/source/portals.c \ + tools/qfbsp/source/qfbsp.c \ + tools/qfbsp/source/readbsp.c \ + tools/qfbsp/source/region.c \ + tools/qfbsp/source/solidbsp.c \ + tools/qfbsp/source/surfaces.c \ + tools/qfbsp/source/tjunc.c \ + tools/qfbsp/source/writebsp.c + +qfbsp_LDADD= $(QFBSP_LIBS) +qfbsp_DEPENDENCIES= $(QFBSP_DEPS) diff --git a/tools/qfbsp/source/brush.c b/tools/qfbsp/source/brush.c index 940fddfb4..97ddbfd4d 100644 --- a/tools/qfbsp/source/brush.c +++ b/tools/qfbsp/source/brush.c @@ -32,11 +32,11 @@ #include "compat.h" -#include "brush.h" -#include "bsp5.h" -#include "draw.h" -#include "options.h" -#include "surfaces.h" +#include "tools/qfbsp/include/brush.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/draw.h" +#include "tools/qfbsp/include/options.h" +#include "tools/qfbsp/include/surfaces.h" /** \addtogroup qfbsp_brush */ diff --git a/tools/qfbsp/source/csg4.c b/tools/qfbsp/source/csg4.c index 444627334..76d11e2d1 100644 --- a/tools/qfbsp/source/csg4.c +++ b/tools/qfbsp/source/csg4.c @@ -27,13 +27,13 @@ #include "QF/sys.h" -#include "brush.h" -#include "bsp5.h" -#include "csg4.h" -#include "draw.h" -#include "merge.h" -#include "solidbsp.h" -#include "surfaces.h" +#include "tools/qfbsp/include/brush.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/csg4.h" +#include "tools/qfbsp/include/draw.h" +#include "tools/qfbsp/include/merge.h" +#include "tools/qfbsp/include/solidbsp.h" +#include "tools/qfbsp/include/surfaces.h" /** \addtogroup qfbsp_csg4 */ diff --git a/tools/qfbsp/source/map.c b/tools/qfbsp/source/map.c index c258b73df..d8bb6c893 100644 --- a/tools/qfbsp/source/map.c +++ b/tools/qfbsp/source/map.c @@ -40,7 +40,7 @@ #include "compat.h" -#include "map.h" +#include "tools/qfbsp/include/map.h" /** \addtogroup qfbsp_map */ diff --git a/tools/qfbsp/source/merge.c b/tools/qfbsp/source/merge.c index 5692a6d83..480af3896 100644 --- a/tools/qfbsp/source/merge.c +++ b/tools/qfbsp/source/merge.c @@ -23,12 +23,12 @@ #include "QF/sys.h" -#include "brush.h" -#include "bsp5.h" -#include "csg4.h" -#include "draw.h" -#include "merge.h" -#include "surfaces.h" +#include "tools/qfbsp/include/brush.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/csg4.h" +#include "tools/qfbsp/include/draw.h" +#include "tools/qfbsp/include/merge.h" +#include "tools/qfbsp/include/surfaces.h" /** \addtogroup qfbsp_merge */ diff --git a/tools/qfbsp/source/nodraw.c b/tools/qfbsp/source/nodraw.c index c333313c5..b7db6dc94 100644 --- a/tools/qfbsp/source/nodraw.c +++ b/tools/qfbsp/source/nodraw.c @@ -21,7 +21,7 @@ # include "config.h" #endif -#include "draw.h" +#include "tools/qfbsp/include/draw.h" /** \addtogroup qfbsp_draw */ diff --git a/tools/qfbsp/source/options.c b/tools/qfbsp/source/options.c index 214065f9b..70b022b5d 100644 --- a/tools/qfbsp/source/options.c +++ b/tools/qfbsp/source/options.c @@ -40,7 +40,7 @@ #include "QF/quakefs.h" -#include "options.h" +#include "tools/qfbsp/include/options.h" /** \addtogroup qfbsp_options */ diff --git a/tools/qfbsp/source/outside.c b/tools/qfbsp/source/outside.c index 3002f468b..15da18dba 100644 --- a/tools/qfbsp/source/outside.c +++ b/tools/qfbsp/source/outside.c @@ -22,12 +22,12 @@ #include "QF/sys.h" -#include "brush.h" -#include "bsp5.h" -#include "draw.h" -#include "options.h" -#include "portals.h" -#include "outside.h" +#include "tools/qfbsp/include/brush.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/draw.h" +#include "tools/qfbsp/include/options.h" +#include "tools/qfbsp/include/portals.h" +#include "tools/qfbsp/include/outside.h" /** \addtogroup qfbsp_outside */ diff --git a/tools/qfbsp/source/portals.c b/tools/qfbsp/source/portals.c index 4871aefbe..cbc128f1e 100644 --- a/tools/qfbsp/source/portals.c +++ b/tools/qfbsp/source/portals.c @@ -28,11 +28,11 @@ #include "QF/sys.h" -#include "brush.h" -#include "bsp5.h" -#include "draw.h" -#include "options.h" -#include "portals.h" +#include "tools/qfbsp/include/brush.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/draw.h" +#include "tools/qfbsp/include/options.h" +#include "tools/qfbsp/include/portals.h" /** \addtogroup qfbsp_portals */ diff --git a/tools/qfbsp/source/qfbsp.c b/tools/qfbsp/source/qfbsp.c index e3948acb8..abbc81029 100644 --- a/tools/qfbsp/source/qfbsp.c +++ b/tools/qfbsp/source/qfbsp.c @@ -43,18 +43,18 @@ #include "QF/quakefs.h" #include "QF/sys.h" -#include "csg4.h" -#include "brush.h" -#include "bsp5.h" -#include "merge.h" -#include "options.h" -#include "outside.h" -#include "portals.h" -#include "readbsp.h" -#include "solidbsp.h" -#include "surfaces.h" -#include "writebsp.h" -#include "tjunc.h" +#include "tools/qfbsp/include/csg4.h" +#include "tools/qfbsp/include/brush.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/merge.h" +#include "tools/qfbsp/include/options.h" +#include "tools/qfbsp/include/outside.h" +#include "tools/qfbsp/include/portals.h" +#include "tools/qfbsp/include/readbsp.h" +#include "tools/qfbsp/include/solidbsp.h" +#include "tools/qfbsp/include/surfaces.h" +#include "tools/qfbsp/include/writebsp.h" +#include "tools/qfbsp/include/tjunc.h" /** \addtogroup qfbsp */ diff --git a/tools/qfbsp/source/readbsp.c b/tools/qfbsp/source/readbsp.c index 4168a2ae5..caf69255b 100644 --- a/tools/qfbsp/source/readbsp.c +++ b/tools/qfbsp/source/readbsp.c @@ -48,11 +48,11 @@ #include "QF/va.h" #include "QF/wad.h" -#include "brush.h" -#include "bsp5.h" -#include "options.h" -#include "portals.h" -#include "readbsp.h" +#include "tools/qfbsp/include/brush.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/options.h" +#include "tools/qfbsp/include/portals.h" +#include "tools/qfbsp/include/readbsp.h" /** \addtogroup qfbsp_readbsp */ diff --git a/tools/qfbsp/source/region.c b/tools/qfbsp/source/region.c index b7c875a22..03dfd2efd 100644 --- a/tools/qfbsp/source/region.c +++ b/tools/qfbsp/source/region.c @@ -29,9 +29,9 @@ #include "compat.h" -#include "bsp5.h" -#include "region.h" -#include "surfaces.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/region.h" +#include "tools/qfbsp/include/surfaces.h" /** \addtogroup qfbsp_region */ diff --git a/tools/qfbsp/source/solidbsp.c b/tools/qfbsp/source/solidbsp.c index d4c9e0f7d..c49422c20 100644 --- a/tools/qfbsp/source/solidbsp.c +++ b/tools/qfbsp/source/solidbsp.c @@ -28,12 +28,12 @@ #include "QF/sys.h" -#include "brush.h" -#include "csg4.h" -#include "bsp5.h" -#include "draw.h" -#include "solidbsp.h" -#include "surfaces.h" +#include "tools/qfbsp/include/brush.h" +#include "tools/qfbsp/include/csg4.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/draw.h" +#include "tools/qfbsp/include/solidbsp.h" +#include "tools/qfbsp/include/surfaces.h" /** \addtogroup qfbsp_solidbsp */ diff --git a/tools/qfbsp/source/surfaces.c b/tools/qfbsp/source/surfaces.c index 9c467c0e1..2c9c08897 100644 --- a/tools/qfbsp/source/surfaces.c +++ b/tools/qfbsp/source/surfaces.c @@ -28,11 +28,11 @@ #include "QF/sys.h" -#include "bsp5.h" -#include "csg4.h" -#include "options.h" -#include "region.h" -#include "surfaces.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/csg4.h" +#include "tools/qfbsp/include/options.h" +#include "tools/qfbsp/include/region.h" +#include "tools/qfbsp/include/surfaces.h" /** \addtogroup qfbsp_surface */ diff --git a/tools/qfbsp/source/tjunc.c b/tools/qfbsp/source/tjunc.c index 50882df87..64588837d 100644 --- a/tools/qfbsp/source/tjunc.c +++ b/tools/qfbsp/source/tjunc.c @@ -29,10 +29,10 @@ #include "compat.h" -#include "brush.h" -#include "bsp5.h" -#include "options.h" -#include "tjunc.h" +#include "tools/qfbsp/include/brush.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/options.h" +#include "tools/qfbsp/include/tjunc.h" /** \addtogroup qfbsp_tjunc */ diff --git a/tools/qfbsp/source/writebsp.c b/tools/qfbsp/source/writebsp.c index fa95b4d57..94f679313 100644 --- a/tools/qfbsp/source/writebsp.c +++ b/tools/qfbsp/source/writebsp.c @@ -37,10 +37,10 @@ #include "QF/va.h" #include "QF/wad.h" -#include "brush.h" -#include "bsp5.h" -#include "options.h" -#include "writebsp.h" +#include "tools/qfbsp/include/brush.h" +#include "tools/qfbsp/include/bsp5.h" +#include "tools/qfbsp/include/options.h" +#include "tools/qfbsp/include/writebsp.h" /** \addtogroup qfbsp_writebsp */ diff --git a/tools/qfcc/Makefile.am b/tools/qfcc/Makefile.am deleted file mode 100644 index b9050ce13..000000000 --- a/tools/qfcc/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# Makefile.am -# -# Automake-using build system for QuakeForge -# -# Copyright (C) 2000 Jeff Teunissen -# -# This Makefile is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to: -# -# Free Software Foundation, Inc. -# 59 Temple Place - Suite 330 -# Boston, MA 02111-1307, USA -# -# $Id$ -# -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= include source doc test - -dist-zip: distdir - -chmod -R a+r $(distdir) - ZIP="-r9q" zip $(distdir).zip $(NOCONV_DIST) - ZIP="-r9ql" zip $(distdir).zip $(distdir) -x $(NOCONV_DIST) - -rm -rf $(distdir) - -dist-bz2: distdir - -chmod -R a+r $(distdir) - BZIP2="-9" $(TAR) Ichof $(distdir).tar.bz2 $(distdir) - -rm -rf $(distdir) - -dist-all-local: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - BZIP2="-9" $(TAR) Ichof $(distdir).tar.bz2 $(distdir) - ZIP="-r9q" zip $(distdir).zip $(NOCONV_DIST) - ZIP="-r9ql" zip $(distdir).zip $(distdir) -x $(NOCONV_DIST) - -rm -rf $(distdir) diff --git a/tools/qfcc/Makemodule.am b/tools/qfcc/Makemodule.am new file mode 100644 index 000000000..e4159fbf3 --- /dev/null +++ b/tools/qfcc/Makemodule.am @@ -0,0 +1,4 @@ +include tools/qfcc/include/Makemodule.am +include tools/qfcc/source/Makemodule.am +include tools/qfcc/doc/Makemodule.am +include tools/qfcc/test/Makemodule.am diff --git a/tools/qfcc/bootstrap b/tools/qfcc/bootstrap deleted file mode 100755 index 071d87a77..000000000 --- a/tools/qfcc/bootstrap +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd `dirname $0` -aclocal && autoheader && automake --add-missing && autoconf diff --git a/tools/qfcc/configure.in b/tools/qfcc/configure.in deleted file mode 100644 index 3c6383d5a..000000000 --- a/tools/qfcc/configure.in +++ /dev/null @@ -1,144 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.13) -AC_INIT(source/qfcc.c) -AC_REVISION($Revision$) dnl -AM_CONFIG_HEADER(include/config.h) -AC_CANONICAL_SYSTEM - -dnl Every other copy of the package version number gets its value from here -AM_INIT_AUTOMAKE(qfcc, 0.1.0) - -AC_SUBST(VERSION) - -ISODATE=`date +%Y-%m-%d` -AC_SUBST(ISODATE) - -AC_LANG_C - -dnl Checks for programs. -AC_PROG_INSTALL -AC_PROG_CC -AC_PROG_CPP -AC_PROG_YACC -AM_PROG_LEX - -AC_ARG_WITH(cpp, -[ --with-cpp=CPP how qfcc should invoke cpp], - cpp_name="$withval", cpp_name=auto -) -if test "x$cpp_name" != xauto; then - CPP_NAME="$cpp_name" -else - CPP_NAME="cpp %u %d %s -o %o %i" - case "$target_os" in - *bsd*) - touch conftest.c - CPP_NAME="`(f=\`$CC -v -E -Dfoo conftest.c -o conftest.i 2>&1 | grep -e -Dfoo\`; set $f; echo "$1")` %d %i %o" - rm -f conftest.[ci] - ;; - esac -fi -AC_DEFINE_UNQUOTED(CPP_NAME, "$CPP_NAME", [Define this to the command line for the C preprocessor]) - -dnl We want warnings, lots of warnings... -if test "x$GCC" = xyes; then - CFLAGS="$CFLAGS -Wall -Werror" - # CFLAGS="$CFLAGS -Wall -pedantic" -fi - -dnl Checks for libraries. -AC_CHECK_LIB(z, gztell,, -) - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(process.h string.h strings.h fcntl.h sys/stat.h sys/types.h sys/wait.h unistd.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_ARG_ENABLE(profile, - [ --enable-profile compile with profiling (for development)], - profile=$enable_profile -) -if test "x$profile" = xyes; then - BUILD_TYPE="$BUILD_TYPE Profile" - if test "x$GCC" = xyes; then - CFLAGS="`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'` -pg" - LDFLAGS="$LDFLAGS -pg" - else - CFLAGS="$CFLAGS -p" - fi -fi - -AC_DEFINE_UNQUOTED(PATH_SEPARATOR, '/', - [Define this to your operating system's path separator character]) - -dnl Checks for library functions. - -AC_CHECK_FUNCS(snprintf _snprintf vsnprintf _vsnprintf) - -AC_MSG_CHECKING(for timeGetTime in -lwinmm) -save_LIBS="$LIBS" -LIBS="$LIBS -lwinmm" -AC_TRY_COMPILE( - [#include ], - [timeGetTime ();], - AC_MSG_RESULT(yes), - LIBS="$save_LIBS" - AC_MSG_RESULT(no) -) - -AC_ARG_WITH(qf, -[ --with-qf=DIR location of QF libs and headers (prefix)], - if test "x$withval" != xyes ; then - LDFLAGS="$LDFLAGS -L${withval}/lib" - CFLAGS="$CFLAGS -I${withval}/include" - fi - , - HAVE_QF=auto -) -AC_MSG_CHECKING(for QF/qtypes.h) -AC_TRY_COMPILE( - [#include "QF/qtypes.h"], - [qboolean foo = false; - foo = true;], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no) - HAVE_QF=no -) -if test "x$HAVE_QF" != xno; then - AC_CHECK_LIB(QFutil, Hash_NewTable, - :, HAVE_QF=no, - [] - ) -fi -if test "x$HAVE_QF" != xno; then - AC_CHECK_LIB(QFgamecode, PR_Opcode, - :, HAVE_QF=no, - [-lQFutil] - ) -fi - -QFCC_LIBS="-lQFgamecode -lQFutil" -QFCC_DEPS="" -QFCC_INCS="" - -if test "x$HAVE_QF" = xno; then - echo '***' - echo '*** You seem to not have the QuakeForge libs & headers installed' - echo '***' - exit 1 -fi - -AC_SUBST(QFCC_LIBS) -AC_SUBST(QFCC_DEPS) -AC_SUBST(QFCC_INCS) - -AC_OUTPUT( - doc/Makefile - doc/man/Makefile - include/Makefile - source/Makefile - Makefile - qfcc.lsm -) diff --git a/tools/qfcc/doc/Makefile.am b/tools/qfcc/doc/Makefile.am deleted file mode 100644 index 8d0026abb..000000000 --- a/tools/qfcc/doc/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= man - -EXTRA_DIST= expressions.txt \ - dot/vector-alias.dot diff --git a/tools/qfcc/doc/Makemodule.am b/tools/qfcc/doc/Makemodule.am new file mode 100644 index 000000000..121e06e82 --- /dev/null +++ b/tools/qfcc/doc/Makemodule.am @@ -0,0 +1,5 @@ +man_MANS += tools/qfcc/doc/man/qfcc.1 + +EXTRA_DIST += \ + tools/qfcc/doc/expressions.txt \ + tools/qfcc/doc/dot/vector-alias.dot diff --git a/tools/qfcc/doc/man/Makefile.am b/tools/qfcc/doc/man/Makefile.am deleted file mode 100644 index cca3e62a5..000000000 --- a/tools/qfcc/doc/man/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -man_MANS=qfcc.1 -EXTRA_DIST=qfcc.1 diff --git a/tools/qfcc/include/Makefile.am b/tools/qfcc/include/Makefile.am deleted file mode 100644 index 140cae90a..000000000 --- a/tools/qfcc/include/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -EXTRA_DIST= class.h codespace.h cpp.h dags.h debug.h def.h defspace.h \ - diagnostic.h dot.h emit.h expr.h flow.h function.h grab.h idstuff.h \ - linker.h method.h obj_file.h obj_type.h opcodes.h options.h pragma.h \ - qfcc.h qfprogs.h reloc.h shared.h statements.h strpool.h struct.h \ - switch.h symtab.h type.h value.h diff --git a/tools/qfcc/include/Makemodule.am b/tools/qfcc/include/Makemodule.am new file mode 100644 index 000000000..689ebad68 --- /dev/null +++ b/tools/qfcc/include/Makemodule.am @@ -0,0 +1,34 @@ +EXTRA_DIST += \ + tools/qfcc/include/class.h \ + tools/qfcc/include/codespace.h \ + tools/qfcc/include/cpp.h \ + tools/qfcc/include/dags.h \ + tools/qfcc/include/debug.h \ + tools/qfcc/include/def.h \ + tools/qfcc/include/defspace.h \ + tools/qfcc/include/diagnostic.h \ + tools/qfcc/include/dot.h \ + tools/qfcc/include/emit.h \ + tools/qfcc/include/expr.h \ + tools/qfcc/include/flow.h \ + tools/qfcc/include/function.h \ + tools/qfcc/include/grab.h \ + tools/qfcc/include/idstuff.h \ + tools/qfcc/include/linker.h \ + tools/qfcc/include/method.h \ + tools/qfcc/include/obj_file.h \ + tools/qfcc/include/obj_type.h \ + tools/qfcc/include/opcodes.h \ + tools/qfcc/include/options.h \ + tools/qfcc/include/pragma.h \ + tools/qfcc/include/qfcc.h \ + tools/qfcc/include/qfprogs.h \ + tools/qfcc/include/reloc.h \ + tools/qfcc/include/shared.h \ + tools/qfcc/include/statements.h \ + tools/qfcc/include/strpool.h \ + tools/qfcc/include/struct.h \ + tools/qfcc/include/switch.h \ + tools/qfcc/include/symtab.h \ + tools/qfcc/include/type.h \ + tools/qfcc/include/value.h diff --git a/tools/qfcc/source/Makefile.am b/tools/qfcc/source/Makefile.am deleted file mode 100644 index b69dd6323..000000000 --- a/tools/qfcc/source/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -## Process this file with automake to produce Makefile.in -# -# Makefile.am -# -# Automake-using build system for QuakeForge -# -# Copyright (C) 2000 Jeff Teunissen -# -# This Makefile is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to: -# -# Free Software Foundation, Inc. -# 59 Temple Place - Suite 330 -# Boston, MA 02111-1307, USA -# -# $Id$ -# -AUTOMAKE_OPTIONS= foreign - -QFCC_LIBS=@QFCC_LIBS@ -QFCC_DEPS=@QFCC_DEPS@ -QFCC_INCS=@QFCC_INCS@ - -AM_CPPFLAGS= -I$(top_srcdir)/include $(QFCC_INCS) -YFLAGS = -v -d -Wno-yacc -Werror - -bin_PROGRAMS= qfcc qfprogs -bin_SCRIPTS= qfpreqcc - -common_src=\ - class.c codespace.c constfold.c cpp.c dags.c debug.c def.c defspace.c \ - diagnostic.c \ - dot.c dot_dag.c dot_expr.c dot_flow.c dot_sblock.c dot_type.c \ - emit.c \ - expr.c expr_assign.c expr_binary.c expr_bool.c expr_compound.c expr_obj.c \ - flow.c function.c grab.c \ - idstuff.c \ - linker.c method.c \ - obj_file.c \ - obj_type.c opcodes.c options.c pragma.c qfcc.c reloc.c shared.c \ - statements.c strpool.c struct.c switch.c symtab.c type.c value.c - -qfcc_SOURCES= qc-lex.l qc-parse.y qp-lex.l qp-parse.y $(common_src) -qfcc_LDADD= $(QFCC_LIBS) -qfcc_DEPENDENCIES= $(QFCC_DEPS) - -qfprogs_SOURCES= \ - disassemble.c dump_globals.c dump_lines.c dump_modules.c dump_strings.c \ - obj_file.c qfprogs.c strpool.c stub.c type.c -qfprogs_LDADD= $(QFCC_LIBS) -qfprogs_DEPENDENCIES= $(QFCC_DEPS) - -BUILT_SOURCES=qc-parse.c qc-parse.h qc-lex.c qp-parse.c qp-parse.h qp-lex.c - -qc-parse.c: qc-parse.y - $(YACC) $(YFLAGS) -Dapi.prefix={qc_yy} $< -o $@ -qc-lex.c: qc-lex.l qc-parse.h - $(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqc_yy -o$@ $< -qp-parse.c: qp-parse.y - $(YACC) $(YFLAGS) -Dapi.prefix={qp_yy} $< -o $@ -qp-lex.c: qp-lex.l qp-parse.h - $(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqp_yy -o$@ $< - -EXTRA_DIST=qc-lex.c qc-parse.c qc-parse.h qfpreqcc \ - qp-parse.c qp-parse.h qp-lex.c diff --git a/tools/qfcc/source/Makemodule.am b/tools/qfcc/source/Makemodule.am new file mode 100644 index 000000000..d8db07b5c --- /dev/null +++ b/tools/qfcc/source/Makemodule.am @@ -0,0 +1,92 @@ +QFCC_LIBS=@QFCC_LIBS@ +QFCC_DEPS=@QFCC_DEPS@ +QFCC_INCS=@QFCC_INCS@ + +bin_PROGRAMS += qfcc qfprogs +bin_SCRIPTS += tools/qfcc/source/qfpreqcc + +qfcc_SOURCES = \ + tools/qfcc/source/class.c \ + tools/qfcc/source/codespace.c \ + tools/qfcc/source/constfold.c \ + tools/qfcc/source/cpp.c \ + tools/qfcc/source/dags.c \ + tools/qfcc/source/debug.c \ + tools/qfcc/source/def.c \ + tools/qfcc/source/defspace.c \ + tools/qfcc/source/diagnostic.c \ + tools/qfcc/source/dot.c \ + tools/qfcc/source/dot_dag.c \ + tools/qfcc/source/dot_expr.c \ + tools/qfcc/source/dot_flow.c \ + tools/qfcc/source/dot_sblock.c \ + tools/qfcc/source/dot_type.c \ + tools/qfcc/source/emit.c \ + tools/qfcc/source/expr.c \ + tools/qfcc/source/expr_assign.c \ + tools/qfcc/source/expr_binary.c \ + tools/qfcc/source/expr_bool.c \ + tools/qfcc/source/expr_compound.c \ + tools/qfcc/source/expr_obj.c \ + tools/qfcc/source/flow.c \ + tools/qfcc/source/function.c \ + tools/qfcc/source/grab.c \ + tools/qfcc/source/idstuff.c \ + tools/qfcc/source/linker.c \ + tools/qfcc/source/method.c \ + tools/qfcc/source/obj_file.c \ + tools/qfcc/source/obj_type.c \ + tools/qfcc/source/opcodes.c \ + tools/qfcc/source/options.c \ + tools/qfcc/source/pragma.c \ + tools/qfcc/source/qc-lex.l \ + tools/qfcc/source/qc-parse.y \ + tools/qfcc/source/qfcc.c \ + tools/qfcc/source/qp-lex.l \ + tools/qfcc/source/qp-parse.y \ + tools/qfcc/source/reloc.c \ + tools/qfcc/source/shared.c \ + tools/qfcc/source/statements.c \ + tools/qfcc/source/strpool.c \ + tools/qfcc/source/struct.c \ + tools/qfcc/source/switch.c \ + tools/qfcc/source/symtab.c \ + tools/qfcc/source/type.c \ + tools/qfcc/source/value.c + +qfcc_LDADD= $(QFCC_LIBS) +qfcc_DEPENDENCIES= $(QFCC_DEPS) + +qfprogs_SOURCES= \ + tools/qfcc/source/disassemble.c \ + tools/qfcc/source/dump_globals.c \ + tools/qfcc/source/dump_lines.c \ + tools/qfcc/source/dump_modules.c \ + tools/qfcc/source/dump_strings.c \ + tools/qfcc/source/obj_file.c \ + tools/qfcc/source/qfprogs.c \ + tools/qfcc/source/strpool.c \ + tools/qfcc/source/stub.c \ + tools/qfcc/source/type.c +qfprogs_LDADD= $(QFCC_LIBS) +qfprogs_DEPENDENCIES= $(QFCC_DEPS) + +BUILT_SOURCES += \ + tools/qfcc/source/qc-parse.c \ + tools/qfcc/source/qc-parse.h \ + tools/qfcc/source/qc-lex.c \ + tools/qfcc/source/qp-parse.c \ + tools/qfcc/source/qp-parse.h \ + tools/qfcc/source/qp-lex.c + +tools/qfcc/source/qc-parse.c: tools/qfcc/source/qc-parse.y + $(YACC) $(YFLAGS) -Dapi.prefix={qc_yy} $< -o $@ +tools/qfcc/source/qc-lex.c: tools/qfcc/source/qc-lex.l tools/qfcc/source/qc-parse.h + $(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqc_yy -o$@ $< +tools/qfcc/source/qp-parse.c: tools/qfcc/source/qp-parse.y + $(YACC) $(YFLAGS) -Dapi.prefix={qp_yy} $< -o $@ +tools/qfcc/source/qp-lex.c: tools/qfcc/source/qp-lex.l tools/qfcc/source/qp-parse.h + $(LEX) $(LFLAGS) $(AM_LFLAGS) -Pqp_yy -o$@ $< + +EXTRA_DIST += \ + tools/qfcc/source/qfpreqcc diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c index 38ffd54a8..52a3e194a 100644 --- a/tools/qfcc/source/class.c +++ b/tools/qfcc/source/class.c @@ -44,24 +44,24 @@ #include "QF/pr_obj.h" #include "QF/va.h" -#include "qfcc.h" +#include "tools/qfcc/include/qfcc.h" -#include "codespace.h" -#include "class.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "method.h" -#include "options.h" -#include "reloc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/codespace.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/method.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" static hashtab_t *class_hash; static hashtab_t *category_hash; diff --git a/tools/qfcc/source/codespace.c b/tools/qfcc/source/codespace.c index 797bc5707..b7cd56bcc 100644 --- a/tools/qfcc/source/codespace.c +++ b/tools/qfcc/source/codespace.c @@ -41,7 +41,7 @@ #include "QF/pr_comp.h" -#include "codespace.h" +#include "tools/qfcc/include/codespace.h" codespace_t * codespace_new (void) diff --git a/tools/qfcc/source/constfold.c b/tools/qfcc/source/constfold.c index 439f4760f..2d2c1400d 100644 --- a/tools/qfcc/source/constfold.c +++ b/tools/qfcc/source/constfold.c @@ -42,14 +42,15 @@ #include #include -#include "diagnostic.h" -#include "expr.h" -#include "options.h" -#include "qfcc.h" -#include "strpool.h" -#include "type.h" -#include "value.h" -#include "qc-parse.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" + +#include "tools/qfcc/source/qc-parse.h" typedef expr_t *(*operation_t) (int op, expr_t *e, expr_t *e1, expr_t *e2); typedef expr_t *(*unaryop_t) (int op, expr_t *e, expr_t *e1); diff --git a/tools/qfcc/source/cpp.c b/tools/qfcc/source/cpp.c index 71b42c6d1..1adb1301b 100644 --- a/tools/qfcc/source/cpp.c +++ b/tools/qfcc/source/cpp.c @@ -54,9 +54,9 @@ #include "QF/dstring.h" -#include "cpp.h" -#include "diagnostic.h" -#include "options.h" +#include "tools/qfcc/include/cpp.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/options.h" typedef struct cpp_arg_s { struct cpp_arg_s *next; diff --git a/tools/qfcc/source/dags.c b/tools/qfcc/source/dags.c index 680abca84..8dec15fa2 100644 --- a/tools/qfcc/source/dags.c +++ b/tools/qfcc/source/dags.c @@ -47,18 +47,18 @@ #include "QF/mathlib.h" #include "QF/set.h" -#include "dags.h" -#include "diagnostic.h" -#include "dot.h" -#include "flow.h" -#include "function.h" -#include "options.h" -#include "qfcc.h" -#include "statements.h" -#include "strpool.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/dags.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/dot.h" +#include "tools/qfcc/include/flow.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/statements.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" static daglabel_t *labels_freelist; static dagnode_t *nodes_freelist; diff --git a/tools/qfcc/source/debug.c b/tools/qfcc/source/debug.c index 7086f44dc..ec0367fa0 100644 --- a/tools/qfcc/source/debug.c +++ b/tools/qfcc/source/debug.c @@ -43,18 +43,18 @@ #include "QF/alloc.h" #include "QF/pr_comp.h" -#include "debug.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "qfcc.h" -#include "reloc.h" -#include "strpool.h" -#include "struct.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/debug.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" int lineno_base; diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c index 1450f0f45..1fb204a67 100644 --- a/tools/qfcc/source/def.c +++ b/tools/qfcc/source/def.c @@ -45,22 +45,22 @@ #include "QF/sys.h" #include "QF/va.h" -#include "qfcc.h" -#include "class.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "function.h" -#include "options.h" -#include "reloc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" static def_t *defs_freelist; diff --git a/tools/qfcc/source/defspace.c b/tools/qfcc/source/defspace.c index 4c3b80ab9..72537f2d0 100644 --- a/tools/qfcc/source/defspace.c +++ b/tools/qfcc/source/defspace.c @@ -44,15 +44,15 @@ #include "QF/sys.h" #include "QF/va.h" -#include "qfcc.h" -#include "defspace.h" -#include "diagnostic.h" -#include "expr.h" -#include "options.h" -#include "reloc.h" -#include "strpool.h" -#include "struct.h" -#include "type.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/type.h" typedef struct locref_s { struct locref_s *next; diff --git a/tools/qfcc/source/diagnostic.c b/tools/qfcc/source/diagnostic.c index ab830280a..d7f9fa1fb 100644 --- a/tools/qfcc/source/diagnostic.c +++ b/tools/qfcc/source/diagnostic.c @@ -33,13 +33,13 @@ #include -#include "qfcc.h" -#include "class.h" -#include "diagnostic.h" -#include "expr.h" -#include "function.h" -#include "options.h" -#include "strpool.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/strpool.h" diagnostic_hook bug_hook; diagnostic_hook error_hook; diff --git a/tools/qfcc/source/disassemble.c b/tools/qfcc/source/disassemble.c index 06624013c..7002510bc 100644 --- a/tools/qfcc/source/disassemble.c +++ b/tools/qfcc/source/disassemble.c @@ -56,7 +56,7 @@ #include "QF/progs.h" #include "QF/sys.h" -#include "qfprogs.h" +#include "tools/qfcc/include/qfprogs.h" void disassemble_progs (progs_t *pr) diff --git a/tools/qfcc/source/dot.c b/tools/qfcc/source/dot.c index 51d82993a..333104dad 100644 --- a/tools/qfcc/source/dot.c +++ b/tools/qfcc/source/dot.c @@ -35,10 +35,10 @@ #include "QF/va.h" -#include "dot.h" -#include "function.h" -#include "options.h" -#include "strpool.h" +#include "tools/qfcc/include/dot.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/strpool.h" static function_t *last_func; static int dot_index; diff --git a/tools/qfcc/source/dot_dag.c b/tools/qfcc/source/dot_dag.c index e954f75d3..541993735 100644 --- a/tools/qfcc/source/dot_dag.c +++ b/tools/qfcc/source/dot_dag.c @@ -44,11 +44,11 @@ #include "QF/set.h" #include "QF/va.h" -#include "dags.h" -#include "statements.h" -#include "strpool.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/dags.h" +#include "tools/qfcc/include/statements.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" static void print_node_def (dstring_t *dstr, dag_t *dag, dagnode_t *node) diff --git a/tools/qfcc/source/dot_expr.c b/tools/qfcc/source/dot_expr.c index 82c29c8d6..4db09bc39 100644 --- a/tools/qfcc/source/dot_expr.c +++ b/tools/qfcc/source/dot_expr.c @@ -46,11 +46,12 @@ #include "qfalloca.h" -#include "expr.h" -#include "symtab.h" -#include "type.h" -#include "qc-parse.h" -#include "strpool.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/strpool.h" + +#include "tools/qfcc/source/qc-parse.h" const char *expr_names[] = { diff --git a/tools/qfcc/source/dot_flow.c b/tools/qfcc/source/dot_flow.c index 68f043d98..0320ebb2d 100644 --- a/tools/qfcc/source/dot_flow.c +++ b/tools/qfcc/source/dot_flow.c @@ -44,12 +44,12 @@ #include "QF/set.h" #include "QF/va.h" -#include "dags.h" -#include "flow.h" -#include "function.h" -#include "expr.h" -#include "statements.h" -#include "strpool.h" +#include "tools/qfcc/include/dags.h" +#include "tools/qfcc/include/flow.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/statements.h" +#include "tools/qfcc/include/strpool.h" typedef struct { void (*node) (dstring_t *, flowgraph_t *, flownode_t *, int); diff --git a/tools/qfcc/source/dot_sblock.c b/tools/qfcc/source/dot_sblock.c index 8e003aa6b..18089681c 100644 --- a/tools/qfcc/source/dot_sblock.c +++ b/tools/qfcc/source/dot_sblock.c @@ -44,15 +44,15 @@ #include #include -#include "dags.h" -#include "flow.h" -#include "expr.h" -#include "qfcc.h" -#include "function.h" -#include "statements.h" -#include "strpool.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/dags.h" +#include "tools/qfcc/include/flow.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/statements.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" static void flow_statement (dstring_t *dstr, statement_t *s) diff --git a/tools/qfcc/source/dot_type.c b/tools/qfcc/source/dot_type.c index bffa4aa70..ae58552b4 100644 --- a/tools/qfcc/source/dot_type.c +++ b/tools/qfcc/source/dot_type.c @@ -44,11 +44,10 @@ #include #include -#include "class.h" -#include "symtab.h" -#include "type.h" -#include "qc-parse.h" -#include "strpool.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/strpool.h" typedef void (*print_f) (dstring_t *dstr, type_t *, int, int); static void dot_print_type (dstring_t *dstr, type_t *t, int level, int id); diff --git a/tools/qfcc/source/dump_globals.c b/tools/qfcc/source/dump_globals.c index 49c78fa5d..fe166885c 100644 --- a/tools/qfcc/source/dump_globals.c +++ b/tools/qfcc/source/dump_globals.c @@ -43,11 +43,11 @@ #include "QF/progs.h" #include "QF/va.h" -#include "obj_file.h" -#include "obj_type.h" -#include "qfprogs.h" -#include "reloc.h" -#include "strpool.h" +#include "tools/qfcc/include/obj_file.h" +#include "tools/qfcc/include/obj_type.h" +#include "tools/qfcc/include/qfprogs.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/strpool.h" static int cmp (const void *_a, const void *_b) diff --git a/tools/qfcc/source/dump_lines.c b/tools/qfcc/source/dump_lines.c index c98bfa0aa..46382cf11 100644 --- a/tools/qfcc/source/dump_lines.c +++ b/tools/qfcc/source/dump_lines.c @@ -43,8 +43,8 @@ #include "QF/progs.h" #include "QF/pr_type.h" -#include "obj_file.h" -#include "qfprogs.h" +#include "tools/qfcc/include/obj_file.h" +#include "tools/qfcc/include/qfprogs.h" typedef struct { const char *source_name; diff --git a/tools/qfcc/source/dump_modules.c b/tools/qfcc/source/dump_modules.c index 68cee44eb..7516f323b 100644 --- a/tools/qfcc/source/dump_modules.c +++ b/tools/qfcc/source/dump_modules.c @@ -44,7 +44,7 @@ #include "QF/progs.h" #include "QF/va.h" -#include "qfprogs.h" +#include "tools/qfcc/include/qfprogs.h" static void dump_methods (progs_t *pr, pr_method_list_t *methods, int class) diff --git a/tools/qfcc/source/dump_strings.c b/tools/qfcc/source/dump_strings.c index 5f119e7cc..ce9627f32 100644 --- a/tools/qfcc/source/dump_strings.c +++ b/tools/qfcc/source/dump_strings.c @@ -36,8 +36,8 @@ #include "QF/progs.h" #include "QF/sys.h" -#include "obj_file.h" -#include "qfprogs.h" +#include "tools/qfcc/include/obj_file.h" +#include "tools/qfcc/include/qfprogs.h" static void dump_string_block (const char *strblock, unsigned size) diff --git a/tools/qfcc/source/emit.c b/tools/qfcc/source/emit.c index e7a4b2465..f61151da3 100644 --- a/tools/qfcc/source/emit.c +++ b/tools/qfcc/source/emit.c @@ -42,21 +42,21 @@ #include #include -#include "codespace.h" -#include "def.h" -#include "defspace.h" -#include "debug.h" -#include "diagnostic.h" -#include "emit.h" -#include "function.h" -#include "opcodes.h" -#include "options.h" -#include "qfcc.h" -#include "reloc.h" -#include "statements.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/codespace.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/debug.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/opcodes.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/statements.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" static def_t zero_def; diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c index 7faa52caf..9ecf0ad15 100644 --- a/tools/qfcc/source/expr.c +++ b/tools/qfcc/source/expr.c @@ -45,25 +45,26 @@ #include "QF/sys.h" #include "QF/va.h" -#include "qfcc.h" -#include "class.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "function.h" -#include "idstuff.h" -#include "method.h" -#include "options.h" -#include "reloc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" -#include "qc-parse.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/idstuff.h" +#include "tools/qfcc/include/method.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" + +#include "tools/qfcc/source/qc-parse.h" static expr_t *exprs_freelist; diff --git a/tools/qfcc/source/expr_assign.c b/tools/qfcc/source/expr_assign.c index 937da6d5c..472c1f1a5 100644 --- a/tools/qfcc/source/expr_assign.c +++ b/tools/qfcc/source/expr_assign.c @@ -45,25 +45,24 @@ #include "QF/sys.h" #include "QF/va.h" -#include "qfcc.h" -#include "class.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "function.h" -#include "idstuff.h" -#include "method.h" -#include "options.h" -#include "reloc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" -#include "qc-parse.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/idstuff.h" +#include "tools/qfcc/include/method.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" static expr_t * check_assign_logic_precedence (expr_t *dst, expr_t *src) diff --git a/tools/qfcc/source/expr_binary.c b/tools/qfcc/source/expr_binary.c index cc75bcbcf..616dc7ac4 100644 --- a/tools/qfcc/source/expr_binary.c +++ b/tools/qfcc/source/expr_binary.c @@ -31,11 +31,12 @@ # include "config.h" #endif -#include "diagnostic.h" -#include "expr.h" -#include "options.h" -#include "type.h" -#include "qc-parse.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/type.h" + +#include "tools/qfcc/source/qc-parse.h" typedef struct { int op; diff --git a/tools/qfcc/source/expr_bool.c b/tools/qfcc/source/expr_bool.c index 0fcb8b394..fd21de053 100644 --- a/tools/qfcc/source/expr_bool.c +++ b/tools/qfcc/source/expr_bool.c @@ -45,25 +45,26 @@ #include "QF/sys.h" #include "QF/va.h" -#include "qfcc.h" -#include "class.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "function.h" -#include "idstuff.h" -#include "method.h" -#include "options.h" -#include "reloc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" -#include "qc-parse.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/idstuff.h" +#include "tools/qfcc/include/method.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" + +#include "tools/qfcc/source/qc-parse.h" expr_t * test_expr (expr_t *e) diff --git a/tools/qfcc/source/expr_compound.c b/tools/qfcc/source/expr_compound.c index 40b4e01c5..e75bb5b70 100644 --- a/tools/qfcc/source/expr_compound.c +++ b/tools/qfcc/source/expr_compound.c @@ -45,11 +45,11 @@ #include "QF/sys.h" #include "QF/va.h" -#include "diagnostic.h" -#include "expr.h" -#include "options.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" static element_t *elements_freelist; diff --git a/tools/qfcc/source/expr_obj.c b/tools/qfcc/source/expr_obj.c index db0b2fe4a..17d53dfdb 100644 --- a/tools/qfcc/source/expr_obj.c +++ b/tools/qfcc/source/expr_obj.c @@ -45,25 +45,24 @@ #include "QF/sys.h" #include "QF/va.h" -#include "qfcc.h" -#include "class.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "function.h" -#include "idstuff.h" -#include "method.h" -#include "options.h" -#include "reloc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" -#include "qc-parse.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/idstuff.h" +#include "tools/qfcc/include/method.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" expr_t * new_self_expr (void) diff --git a/tools/qfcc/source/flow.c b/tools/qfcc/source/flow.c index 438ece827..e26bcef1b 100644 --- a/tools/qfcc/source/flow.c +++ b/tools/qfcc/source/flow.c @@ -44,18 +44,18 @@ #include "QF/set.h" #include "QF/va.h" -#include "dags.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "dot.h" -#include "flow.h" -#include "function.h" -#include "options.h" -#include "qfcc.h" -#include "statements.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/dags.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/dot.h" +#include "tools/qfcc/include/flow.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/statements.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" /// \addtogroup qfcc_flow ///@{ diff --git a/tools/qfcc/source/function.c b/tools/qfcc/source/function.c index b199bf51d..940abf11e 100644 --- a/tools/qfcc/source/function.c +++ b/tools/qfcc/source/function.c @@ -44,27 +44,27 @@ #include "QF/hash.h" #include "QF/va.h" -#include "qfcc.h" +#include "tools/qfcc/include/qfcc.h" -#include "class.h" -#include "codespace.h" -#include "debug.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "flow.h" -#include "function.h" -#include "opcodes.h" -#include "options.h" -#include "reloc.h" -#include "shared.h" -#include "statements.h" -#include "strpool.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/codespace.h" +#include "tools/qfcc/include/debug.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/flow.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/opcodes.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/statements.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" static param_t *params_freelist; static function_t *functions_freelist; diff --git a/tools/qfcc/source/grab.c b/tools/qfcc/source/grab.c index 27f726519..0d59c1217 100644 --- a/tools/qfcc/source/grab.c +++ b/tools/qfcc/source/grab.c @@ -44,12 +44,12 @@ #include "QF/hash.h" #include "QF/quakeio.h" -#include "diagnostic.h" -#include "expr.h" -#include "grab.h" -#include "options.h" -#include "qfcc.h" -#include "strpool.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/grab.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/strpool.h" int grab_frame; int grab_other; diff --git a/tools/qfcc/source/idstuff.c b/tools/qfcc/source/idstuff.c index 2f195b7e2..1bc222f49 100644 --- a/tools/qfcc/source/idstuff.c +++ b/tools/qfcc/source/idstuff.c @@ -43,16 +43,16 @@ #include #include -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "qfcc.h" -#include "expr.h" -#include "idstuff.h" -#include "options.h" -#include "strpool.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/idstuff.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" #define MAX_SOUNDS 1024 #define MAX_MODELS 1024 diff --git a/tools/qfcc/source/linker.c b/tools/qfcc/source/linker.c index dd0e48722..2f6e4a565 100644 --- a/tools/qfcc/source/linker.c +++ b/tools/qfcc/source/linker.c @@ -58,21 +58,21 @@ #include "QF/pakfile.h" #include "QF/va.h" -#include "class.h" -#include "codespace.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "linker.h" -#include "obj_file.h" -#include "obj_type.h" -#include "options.h" -#include "qfcc.h" -#include "reloc.h" -#include "strpool.h" -#include "type.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/codespace.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/linker.h" +#include "tools/qfcc/include/obj_file.h" +#include "tools/qfcc/include/obj_type.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/type.h" static void linker_internal_error (const char *fmt, ...) __attribute__ ((format (printf, 1, 2), noreturn)); diff --git a/tools/qfcc/source/method.c b/tools/qfcc/source/method.c index ae3d031e1..244ae1513 100644 --- a/tools/qfcc/source/method.c +++ b/tools/qfcc/source/method.c @@ -44,23 +44,23 @@ #include "QF/pr_obj.h" #include "QF/va.h" -#include "qfcc.h" +#include "tools/qfcc/include/qfcc.h" -#include "expr.h" -#include "class.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "method.h" -#include "options.h" -#include "reloc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/method.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" static hashtab_t *known_methods; diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c index dcc1543d4..76a5219d4 100644 --- a/tools/qfcc/source/obj_file.c +++ b/tools/qfcc/source/obj_file.c @@ -46,23 +46,23 @@ #include "QF/quakeio.h" #include "QF/va.h" -#include "codespace.h" -#include "debug.h" -#include "def.h" -#include "defspace.h" -#include "emit.h" -#include "expr.h" -#include "function.h" -#include "obj_file.h" -#include "obj_type.h" -#include "options.h" -#include "qfcc.h" -#include "reloc.h" -#include "statements.h" -#include "strpool.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/codespace.h" +#include "tools/qfcc/include/debug.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/obj_file.h" +#include "tools/qfcc/include/obj_type.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/statements.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" static int count_relocs (reloc_t *r) diff --git a/tools/qfcc/source/obj_type.c b/tools/qfcc/source/obj_type.c index 6838c0824..7f87e43df 100644 --- a/tools/qfcc/source/obj_type.c +++ b/tools/qfcc/source/obj_type.c @@ -42,16 +42,16 @@ #include "compat.h" -#include "class.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "obj_type.h" -#include "qfcc.h" -#include "reloc.h" -#include "symtab.h" -#include "value.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/obj_type.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/value.h" #define ENC_DEF(dest,def) EMIT_DEF (pr.type_data, dest, def) #define ENC_STR(dest,str) \ diff --git a/tools/qfcc/source/opcodes.c b/tools/qfcc/source/opcodes.c index 045d14404..a9bda7a3c 100644 --- a/tools/qfcc/source/opcodes.c +++ b/tools/qfcc/source/opcodes.c @@ -41,11 +41,11 @@ #include -#include "opcodes.h" -#include "options.h" -#include "qfcc.h" -#include "statements.h" -#include "type.h" +#include "tools/qfcc/include/opcodes.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/statements.h" +#include "tools/qfcc/include/type.h" hashtab_t *opcode_type_table; hashtab_t *opcode_void_table; diff --git a/tools/qfcc/source/options.c b/tools/qfcc/source/options.c index e3f9e504e..758e388a3 100644 --- a/tools/qfcc/source/options.c +++ b/tools/qfcc/source/options.c @@ -45,11 +45,11 @@ #include "QF/pr_comp.h" #include "QF/va.h" -#include "cpp.h" -#include "linker.h" -#include "options.h" -#include "qfcc.h" -#include "strpool.h" +#include "tools/qfcc/include/cpp.h" +#include "tools/qfcc/include/linker.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/strpool.h" const char *this_program; const char **source_files; diff --git a/tools/qfcc/source/pragma.c b/tools/qfcc/source/pragma.c index e1a465b53..d82f2aef4 100644 --- a/tools/qfcc/source/pragma.c +++ b/tools/qfcc/source/pragma.c @@ -42,12 +42,12 @@ #include "QF/alloc.h" #include "QF/pr_comp.h" -#include "diagnostic.h" -#include "opcodes.h" -#include "options.h" -#include "pragma.h" -#include "strpool.h" -#include "type.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/opcodes.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/pragma.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/type.h" typedef struct pragma_arg_s { struct pragma_arg_s *next; diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l index a2a8295bd..50e54817d 100644 --- a/tools/qfcc/source/qc-lex.l +++ b/tools/qfcc/source/qc-lex.l @@ -45,22 +45,22 @@ #include #include -#include "class.h" -#include "debug.h" -#include "diagnostic.h" -#include "expr.h" -#include "grab.h" -#include "options.h" -#include "pragma.h" -#include "qfcc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/debug.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/grab.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/pragma.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" -#include "qc-parse.h" +#include "tools/qfcc/source/qc-parse.h" #ifndef YY_PROTO # define YY_PROTO(x) x diff --git a/tools/qfcc/source/qc-parse.y b/tools/qfcc/source/qc-parse.y index f759a4964..b08884b92 100644 --- a/tools/qfcc/source/qc-parse.y +++ b/tools/qfcc/source/qc-parse.y @@ -44,24 +44,24 @@ #include #include -#include "class.h" -#include "debug.h" -#include "def.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "function.h" -#include "method.h" -#include "options.h" -#include "qfcc.h" -#include "reloc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "switch.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/debug.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/method.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/switch.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" #define YYDEBUG 1 #define YYERROR_VERBOSE 1 diff --git a/tools/qfcc/source/qfcc.c b/tools/qfcc/source/qfcc.c index c0739e9f0..96c26e4b0 100644 --- a/tools/qfcc/source/qfcc.c +++ b/tools/qfcc/source/qfcc.c @@ -65,31 +65,31 @@ #include #include -#include "qfcc.h" -#include "class.h" -#include "codespace.h" -#include "cpp.h" -#include "debug.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "function.h" -#include "grab.h" -#include "idstuff.h" -#include "linker.h" -#include "method.h" -#include "obj_file.h" -#include "opcodes.h" -#include "options.h" -#include "reloc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/codespace.h" +#include "tools/qfcc/include/cpp.h" +#include "tools/qfcc/include/debug.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/grab.h" +#include "tools/qfcc/include/idstuff.h" +#include "tools/qfcc/include/linker.h" +#include "tools/qfcc/include/method.h" +#include "tools/qfcc/include/obj_file.h" +#include "tools/qfcc/include/opcodes.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" options_t options; diff --git a/tools/qfcc/source/qfprogs.c b/tools/qfcc/source/qfprogs.c index 787c9068a..03d09123d 100644 --- a/tools/qfcc/source/qfprogs.c +++ b/tools/qfcc/source/qfprogs.c @@ -63,10 +63,10 @@ #include "QF/va.h" #include "QF/zone.h" -#include "obj_file.h" -#include "obj_type.h" -#include "qfprogs.h" -#include "reloc.h" +#include "tools/qfcc/include/obj_file.h" +#include "tools/qfcc/include/obj_type.h" +#include "tools/qfcc/include/qfprogs.h" +#include "tools/qfcc/include/reloc.h" const char *reloc_names[] = { "none", diff --git a/tools/qfcc/source/qp-lex.l b/tools/qfcc/source/qp-lex.l index 5947f5846..a57185209 100644 --- a/tools/qfcc/source/qp-lex.l +++ b/tools/qfcc/source/qp-lex.l @@ -35,17 +35,17 @@ #include "QF/hash.h" -#include "debug.h" -#include "diagnostic.h" -#include "expr.h" -#include "grab.h" -#include "qfcc.h" -#include "shared.h" -#include "strpool.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/debug.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/grab.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" -#include "qp-parse.h" +#include "tools/qfcc/source/qp-parse.h" #ifndef YY_PROTO # define YY_PROTO(x) x diff --git a/tools/qfcc/source/qp-parse.y b/tools/qfcc/source/qp-parse.y index 730eab57a..15159deb0 100644 --- a/tools/qfcc/source/qp-parse.y +++ b/tools/qfcc/source/qp-parse.y @@ -41,15 +41,15 @@ #include "QF/dstring.h" -#include "codespace.h" -#include "diagnostic.h" -#include "expr.h" -#include "function.h" -#include "qfcc.h" -#include "reloc.h" -#include "shared.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/codespace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" #define YYDEBUG 1 #define YYERROR_VERBOSE 1 diff --git a/tools/qfcc/source/reloc.c b/tools/qfcc/source/reloc.c index 7c4ed3ce3..c1d471d0a 100644 --- a/tools/qfcc/source/reloc.c +++ b/tools/qfcc/source/reloc.c @@ -41,15 +41,15 @@ #include "QF/alloc.h" -#include "codespace.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "function.h" -#include "qfcc.h" -#include "reloc.h" +#include "tools/qfcc/include/codespace.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" static reloc_t *refs_freelist; diff --git a/tools/qfcc/source/shared.c b/tools/qfcc/source/shared.c index 25e0ac979..cee0d06c1 100644 --- a/tools/qfcc/source/shared.c +++ b/tools/qfcc/source/shared.c @@ -31,14 +31,14 @@ # include "config.h" #endif -#include "class.h" -#include "diagnostic.h" -#include "expr.h" -#include "function.h" -#include "options.h" -#include "shared.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" function_t *current_func; class_type_t *current_class; diff --git a/tools/qfcc/source/statements.c b/tools/qfcc/source/statements.c index ba0e07331..2383dcc84 100644 --- a/tools/qfcc/source/statements.c +++ b/tools/qfcc/source/statements.c @@ -45,20 +45,21 @@ #include "QF/mathlib.h" #include "QF/va.h" -#include "dags.h" -#include "diagnostic.h" -#include "dot.h" -#include "expr.h" -#include "function.h" -#include "options.h" -#include "qfcc.h" -#include "reloc.h" -#include "statements.h" -#include "strpool.h" -#include "symtab.h" -#include "type.h" -#include "value.h" -#include "qc-parse.h" +#include "tools/qfcc/include/dags.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/dot.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/statements.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" + +#include "tools/qfcc/source/qc-parse.h" const char *op_type_names[] = { "op_def", diff --git a/tools/qfcc/source/strpool.c b/tools/qfcc/source/strpool.c index d3ab07a1c..fa30c74d5 100644 --- a/tools/qfcc/source/strpool.c +++ b/tools/qfcc/source/strpool.c @@ -44,9 +44,9 @@ #include "QF/dstring.h" #include "QF/hash.h" -#include "diagnostic.h" -#include "options.h" -#include "strpool.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/strpool.h" static hashtab_t *saved_strings; diff --git a/tools/qfcc/source/struct.c b/tools/qfcc/source/struct.c index 64553a8df..c42935dd2 100644 --- a/tools/qfcc/source/struct.c +++ b/tools/qfcc/source/struct.c @@ -47,21 +47,21 @@ #include #include -#include "class.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "obj_type.h" -#include "qfcc.h" -#include "reloc.h" -#include "shared.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/obj_type.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/shared.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" static symbol_t * find_tag (ty_meta_e meta, symbol_t *tag, type_t *type) diff --git a/tools/qfcc/source/stub.c b/tools/qfcc/source/stub.c index 411a8d3a6..af31e546f 100644 --- a/tools/qfcc/source/stub.c +++ b/tools/qfcc/source/stub.c @@ -4,25 +4,25 @@ #include -#include "class.h" -#include "codespace.h" -#include "diagnostic.h" -#include "dot.h" -#include "debug.h" -#include "def.h" -#include "defspace.h" -#include "emit.h" -#include "expr.h" -#include "function.h" -#include "obj_file.h" -#include "obj_type.h" -#include "options.h" -#include "qfcc.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/codespace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/dot.h" +#include "tools/qfcc/include/debug.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/obj_file.h" +#include "tools/qfcc/include/obj_type.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" struct dstring_s; options_t options; diff --git a/tools/qfcc/source/switch.c b/tools/qfcc/source/switch.c index 77e79f3a4..77f490c76 100644 --- a/tools/qfcc/source/switch.c +++ b/tools/qfcc/source/switch.c @@ -42,18 +42,18 @@ #include #include -#include "def.h" -#include "diagnostic.h" -#include "expr.h" -#include "opcodes.h" -#include "options.h" -#include "qfcc.h" -#include "reloc.h" -#include "switch.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/opcodes.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/switch.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" -#include "qc-parse.h" +#include "tools/qfcc/source/qc-parse.h" typedef struct case_node_s { expr_t *low; diff --git a/tools/qfcc/source/symtab.c b/tools/qfcc/source/symtab.c index 961c00b1a..ca08069bf 100644 --- a/tools/qfcc/source/symtab.c +++ b/tools/qfcc/source/symtab.c @@ -37,16 +37,16 @@ #include "QF/alloc.h" #include "QF/hash.h" -#include "class.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "function.h" -#include "qfcc.h" -#include "reloc.h" -#include "strpool.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" static symtab_t *symtabs_freelist; static symbol_t *symbols_freelist; diff --git a/tools/qfcc/source/type.c b/tools/qfcc/source/type.c index 753ccae10..c6b92b94e 100644 --- a/tools/qfcc/source/type.c +++ b/tools/qfcc/source/type.c @@ -47,18 +47,18 @@ #include "QF/sys.h" #include "QF/va.h" -#include "class.h" -#include "def.h" -#include "diagnostic.h" -#include "expr.h" -#include "function.h" -#include "obj_type.h" -#include "options.h" -#include "qfcc.h" -#include "strpool.h" -#include "struct.h" -#include "symtab.h" -#include "type.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/obj_type.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/struct.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" // simple types. function types are dynamically allocated type_t type_invalid = { ev_invalid, "invalid" }; diff --git a/tools/qfcc/source/value.c b/tools/qfcc/source/value.c index b2182497e..db98cd60a 100644 --- a/tools/qfcc/source/value.c +++ b/tools/qfcc/source/value.c @@ -45,17 +45,17 @@ #include "QF/mathlib.h" #include "QF/va.h" -#include "qfcc.h" -#include "def.h" -#include "defspace.h" -#include "diagnostic.h" -#include "emit.h" -#include "expr.h" -#include "reloc.h" -#include "strpool.h" -#include "symtab.h" -#include "type.h" -#include "value.h" +#include "tools/qfcc/include/qfcc.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" +#include "tools/qfcc/include/diagnostic.h" +#include "tools/qfcc/include/emit.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/reloc.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/symtab.h" +#include "tools/qfcc/include/type.h" +#include "tools/qfcc/include/value.h" typedef struct { def_t *def; diff --git a/tools/qfcc/test/Makefile.am b/tools/qfcc/test/Makefile.am deleted file mode 100644 index 49ce3f51b..000000000 --- a/tools/qfcc/test/Makefile.am +++ /dev/null @@ -1,615 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -QFCC_LIBS=@QFCC_LIBS@ -QFCC_DEPS=@QFCC_DEPS@ -QFCC_INCS=@QFCC_INCS@ - -AM_CPPFLAGS= -I$(top_srcdir)/include $(QFCC_INCS) - -QFCC_DEP=$(builddir)/../source/qfcc$(EXEEXT) -QFCC=$(QFCC_DEP) - -QCFLAGS=-qq -O -g -Werror -QCPPFLAGS=--no-default-paths -I$(top_srcdir)/ruamoko/include -QCOMPILE=$(QFCC) $(QCFLAGS) $(QCPPFLAGS) - -SUFFIXES=.qfo .r .pas -.r.qfo: - $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $< - @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo - @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo -.pas.qfo: - $(QCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tqo -c -o $@ $< - @sed -i -e '1s@:@: $(QFCC_DEP)@' $(DEPDIR)/$*.Tqo - @$(am__mv) $(DEPDIR)/$*.Tqo $(DEPDIR)/$*.Qo - -QFCC_TEST_LIBS=@QFCC_TEST_LIBS@ -QFCC_TEST_DEPS=@QFCC_TEST_DEPS@ -QFCC_TEST_INCS=@QFCC_TEST_INCS@ - -test_bins=\ - test-defspace - -fail_bins= - -test_progs_dat=\ - address-cast.dat \ - alignment.dat \ - assignchain.dat \ - anonstruct.dat \ - chewed-alias.dat \ - chewed-return.dat \ - comma-expr.dat \ - compound.dat \ - deadbool.dat \ - double.dat \ - double-alias.dat \ - enum.dat \ - fordecl.dat \ - func-expr.dat \ - func-expr2.dat \ - func-static.dat \ - gcd.dat \ - infloop.dat \ - ivar-struct-return.dat \ - methodparams.dat \ - modulo.dat \ - nilparamret.dat \ - overload.dat \ - paramret.dat \ - quaternion.dat \ - return-ivar.dat \ - sendv.dat \ - state.dat \ - struct-init-param.dat \ - struct-nil-init.dat \ - structarray.dat \ - structlive.dat \ - structptr.dat \ - structstruct.dat \ - swap.dat \ - triangle.dat \ - typedef.dat \ - typelinker.dat \ - unaryminus.dat \ - vecaddr.dat \ - vecexpr.dat \ - vecinit.dat \ - voidfor.dat \ - while.dat \ - zerolinker.dat \ - $e - -fail_progs_dat= - -test_build_errors=\ - classarray.r \ - double-demote-float.r \ - double-demote-float-ainit.r \ - double-demote-float-ginit.r \ - double-demote-float-linit.r \ - double-demote-int.r \ - double-demote-int-ainit.r \ - double-demote-int-ginit.r \ - double-demote-int-linit.r \ - double-int-compare.r \ - double-float-compare.r - -fail_build_errors= - -test_defspace_src=\ - tw-defspace.c tw-diagnostic.c tw-strpool.c - -TESTS=\ - $(test_bins) \ - $(test_progs_dat:.dat=.run) \ - $(test_build_errors:.r=.run) -XFAIL_TESTS=\ - $(fail_bins) \ - $(fail_progs_dat:.dat=.run) \ - $(fail_build_errors:.r=.run) - -check_PROGRAMS=test-harness $(test_progs_dat) $(test_bins) - -test_defspace_SOURCES= test-defspace.c $(test_defspace_src) -test_defspace_LDADD= $(QFCC_LIBS) -test_defspace_DEPENDENCIES= $(QFCC_DEPS) - -test_harness_SOURCES= test-bi.c test-harness.c -test_harness_LDADD= $(QFCC_TEST_LIBS) -test_harness_DEPENDENCIES= $(QFCC_TEST_DEPS) - -r_depfiles_remade= - -address_cast_dat_SOURCES=address-cast.r -address_cast_obj=$(address_cast_dat_SOURCES:.r=.qfo) -address_cast_dep=$(addprefix ./$(DEPDIR)/,$(address_cast_obj:.qfo=.Qo)) -address-cast.dat$(EXEEXT): $(address_cast_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(address_cast_obj) -address-cast.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(address_cast_dep) # am--include-marker -r_depfiles_remade += $(address_cast_dep) - -alignment_dat_SOURCES=alignment.r -alignment_obj=$(alignment_dat_SOURCES:.r=.qfo) -alignment_dep=$(addprefix ./$(DEPDIR)/,$(alignment_obj:.qfo=.Qo)) -alignment.dat$(EXEEXT): $(alignment_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(alignment_obj) -alignment.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(alignment_dep) # am--include-marker -r_depfiles_remade += $(alignment_dep) - -anonstruct_dat_SOURCES=anonstruct.r -anonstruct_obj=$(anonstruct_dat_SOURCES:.r=.qfo) -anonstruct_dep=$(addprefix ./$(DEPDIR)/,$(anonstruct_obj:.qfo=.Qo)) -anonstruct.dat$(EXEEXT): $(anonstruct_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(anonstruct_obj) -anonstruct.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(anonstruct_dep) # am--include-marker -r_depfiles_remade += $(anonstruct_dep) - -assignchain_dat_SOURCES=assignchain.r -assignchain_obj=$(assignchain_dat_SOURCES:.r=.qfo) -assignchain_dep=$(addprefix ./$(DEPDIR)/,$(assignchain_obj:.qfo=.Qo)) -assignchain.dat$(EXEEXT): $(assignchain_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(assignchain_obj) -assignchain.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(assignchain_dep) # am--include-marker -r_depfiles_remade += $(assignchain_dep) - -chewed_alias_dat_SOURCES=chewed-alias.r -chewed_alias_obj=$(chewed_alias_dat_SOURCES:.r=.qfo) -chewed_alias_dep=$(addprefix ./$(DEPDIR)/,$(chewed_alias_obj:.qfo=.Qo)) -chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj) -chewed-alias.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(chewed_alias_dep) # am--include-marker -r_depfiles_remade += $(chewed_alias_dep) - -chewed_return_dat_SOURCES=chewed-return.r -chewed_return_obj=$(chewed_return_dat_SOURCES:.r=.qfo) -chewed_return_dep=$(addprefix ./$(DEPDIR)/,$(chewed_return_obj:.qfo=.Qo)) -chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj) -chewed-return.run: Makefile build-run - @TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@ -include $(chewed_return_dep) # am--include-marker -r_depfiles_remade += $(chewed_return_dep) - -comma_expr_dat_SOURCES=comma-expr.r -comma_expr_obj=$(comma_expr_dat_SOURCES:.r=.qfo) -comma_expr_dep=$(addprefix ./$(DEPDIR)/,$(comma_expr_obj:.qfo=.Qo)) -comma-expr.dat$(EXEEXT): $(comma_expr_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(comma_expr_obj) -comma-expr.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(comma_expr_dep) # am--include-marker -r_depfiles_remade += $(comma_expr_dep) - -compound_dat_SOURCES=compound.r -compound_obj=$(compound_dat_SOURCES:.r=.qfo) -compound_dep=$(addprefix ./$(DEPDIR)/,$(compound_obj:.qfo=.Qo)) -compound.dat$(EXEEXT): $(compound_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(compound_obj) -compound.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(compound_dep) # am--include-marker -r_depfiles_remade += $(compound_dep) - -deadbool_dat_SOURCES=deadbool.r -deadbool_obj=$(deadbool_dat_SOURCES:.r=.qfo) -deadbool_dep=$(addprefix ./$(DEPDIR)/,$(deadbool_obj:.qfo=.Qo)) -deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj) -deadbool.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(deadbool_dep) # am--include-marker -r_depfiles_remade += $(deadbool_dep) - -double_dat_SOURCES=double.r -double_obj=$(double_dat_SOURCES:.r=.qfo) -double_dep=$(addprefix ./$(DEPDIR)/,$(double_obj:.qfo=.Qo)) -double.dat$(EXEEXT): $(double_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(double_obj) -double.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(double_dep) # am--include-marker -r_depfiles_remade += $(double_dep) - -double_alias_dat_SOURCES=double-alias.r -double_alias_obj=$(double_alias_dat_SOURCES:.r=.qfo) -double_alias_dep=$(addprefix ./$(DEPDIR)/,$(double_alias_obj:.qfo=.Qo)) -double-alias.dat$(EXEEXT): $(double_alias_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(double_alias_obj) -double-alias.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(double_alias_dep) # am--include-marker -r_depfiles_remade += $(double_alias_dep) - -classarray.run$(EXEEXT): classarray.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -double-demote-int.run$(EXEEXT): double-demote-int.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -double-demote-float.run$(EXEEXT): double-demote-float.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -double-demote-int-ainit.run$(EXEEXT): double-demote-int-ainit.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -double-demote-float-ainit.run$(EXEEXT): double-demote-float-ainit.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -double-demote-int-ginit.run$(EXEEXT): double-demote-int-ginit.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -double-demote-float-ginit.run$(EXEEXT): double-demote-float-ginit.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -double-demote-int-linit.run$(EXEEXT): double-demote-int-linit.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -double-demote-float-linit.run$(EXEEXT): double-demote-float-linit.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -double-int-compare.run$(EXEEXT): double-int-compare.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -double-float-compare.run$(EXEEXT): double-float-compare.r Makefile build-compile-fail-run - @$(srcdir)/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< - -enum_dat_SOURCES=enum.r -enum_obj=$(enum_dat_SOURCES:.r=.qfo) -enum_dep=$(addprefix ./$(DEPDIR)/,$(enum_obj:.qfo=.Qo)) -enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(enum_obj) -enum.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(enum_dep) # am--include-marker -r_depfiles_remade += $(enum_dep) - -fordecl_dat_SOURCES=fordecl.r -fordecl_obj=$(fordecl_dat_SOURCES:.r=.qfo) -fordecl_dep=$(addprefix ./$(DEPDIR)/,$(fordecl_obj:.qfo=.Qo)) -fordecl.dat$(EXEEXT): $(fordecl_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(fordecl_obj) -fordecl.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(fordecl_dep) # am--include-marker -r_depfiles_remade += $(fordecl_dep) - -func_expr_dat_SOURCES=func-expr.r -func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo) -func_expr_dep=$(addprefix ./$(DEPDIR)/,$(func_expr_obj:.qfo=.Qo)) -func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj) -func-expr.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(func_expr_dep) # am--include-marker -r_depfiles_remade += $(func_expr_dep) - -func_expr2_dat_SOURCES=func-expr2.r -func_expr2_obj=$(func_expr2_dat_SOURCES:.r=.qfo) -func_expr2_dep=$(addprefix ./$(DEPDIR)/,$(func_expr2_obj:.qfo=.Qo)) -func-expr2.dat$(EXEEXT): $(func_expr2_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(func_expr2_obj) -func-expr2.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(func_expr2_dep) # am--include-marker -r_depfiles_remade += $(func_expr2_dep) - -func_static_dat_SOURCES=func-static.r -func_static_obj=$(func_static_dat_SOURCES:.r=.qfo) -func_static_dep=$(addprefix ./$(DEPDIR)/,$(func_static_obj:.qfo=.Qo)) -func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(func_static_obj) -func-static.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(func_static_dep) # am--include-marker -r_depfiles_remade += $(func_static_dep) - -gcd_dat_SOURCES=gcd.pas -gcd_obj=$(gcd_dat_SOURCES:.pas=.qfo) -gcd_dep=$(addprefix ./$(DEPDIR)/,$(gcd_obj:.qfo=.Qo)) -gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(gcd_obj) -gcd.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(gcd_dep) # am--include-marker -r_depfiles_remade += $(gcd_dep) - -infloop_dat_SOURCES=infloop.r -infloop_obj=$(infloop_dat_SOURCES:.r=.qfo) -infloop_dep=$(addprefix ./$(DEPDIR)/,$(infloop_obj:.qfo=.Qo)) -infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(infloop_obj) -infloop.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(infloop_dep) # am--include-marker -r_depfiles_remade += $(infloop_dep) - -ivar_struct_return_dat_SOURCES=ivar-struct-return.r -ivar_struct_return_obj=$(ivar_struct_return_dat_SOURCES:.r=.qfo) -ivar_struct_return_dep=$(addprefix ./$(DEPDIR)/,$(ivar_struct_return_obj:.qfo=.Qo)) -ivar-struct-return.dat$(EXEEXT): $(ivar_struct_return_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(ivar_struct_return_obj) -ivar-struct-return.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(ivar_struct_return_dep) # am--include-marker -r_depfiles_remade += $(ivar_struct_return_dep) - -methodparams_dat_SOURCES=methodparams.r -methodparams_obj=$(methodparams_dat_SOURCES:.r=.qfo) -methodparams_dep=$(addprefix ./$(DEPDIR)/,$(methodparams_obj:.qfo=.Qo)) -methodparams.dat$(EXEEXT): $(methodparams_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(methodparams_obj) -methodparams.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(methodparams_dep) # am--include-marker -r_depfiles_remade += $(methodparams_dep) - -modulo_dat_SOURCES=modulo.r -modulo_obj=$(modulo_dat_SOURCES:.r=.qfo) -modulo_dep=$(addprefix ./$(DEPDIR)/,$(modulo_obj:.qfo=.Qo)) -modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(modulo_obj) -modulo.run: Makefile build-run - @TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@ -include $(modulo_dep) # am--include-marker -r_depfiles_remade += $(modulo_dep) - -nilparamret_dat_SOURCES=nilparamret.r -nilparamret_obj=$(nilparamret_dat_SOURCES:.r=.qfo) -nilparamret_dep=$(addprefix ./$(DEPDIR)/,$(nilparamret_obj:.qfo=.Qo)) -nilparamret.dat$(EXEEXT): $(nilparamret_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(nilparamret_obj) -nilparamret.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(nilparamret_dep) # am--include-marker -r_depfiles_remade += $(nilparamret_dep) - -overload_dat_SOURCES=overload.r -overload_obj=$(overload_dat_SOURCES:.r=.qfo) -overload_dep=$(addprefix ./$(DEPDIR)/,$(overload_obj:.qfo=.Qo)) -overload.dat$(EXEEXT): $(overload_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(overload_obj) -overload.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(overload_dep) # am--include-marker -r_depfiles_remade += $(overload_dep) - -paramret_dat_SOURCES=paramret.r -paramret_obj=$(paramret_dat_SOURCES:.r=.qfo) -paramret_dep=$(addprefix ./$(DEPDIR)/,$(paramret_obj:.qfo=.Qo)) -paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(paramret_obj) -paramret.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(paramret_dep) # am--include-marker -r_depfiles_remade += $(paramret_dep) - -quaternion_dat_SOURCES=quaternion.r -quaternion_obj=$(quaternion_dat_SOURCES:.r=.qfo) -quaternion_dep=$(addprefix ./$(DEPDIR)/,$(quaternion_obj:.qfo=.Qo)) -quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj) -quaternion.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(quaternion_dep) # am--include-marker -r_depfiles_remade += $(quaternion_dep) - -return_ivar_dat_SOURCES=return-ivar.r -return_ivar_obj=$(return_ivar_dat_SOURCES:.r=.qfo) -return_ivar_dep=$(addprefix ./$(DEPDIR)/,$(return_ivar_obj:.qfo=.Qo)) -return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj) -return-ivar.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(return_ivar_dep) # am--include-marker -r_depfiles_remade += $(return_ivar_dep) - -sendv_dat_SOURCES=sendv.r -sendv_obj=$(sendv_dat_SOURCES:.r=.qfo) -sendv_dep=$(addprefix ./$(DEPDIR)/,$(sendv_obj:.qfo=.Qo)) -sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(sendv_obj) -sendv.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(sendv_dep) # am--include-marker -r_depfiles_remade += $(sendv_dep) - -state_dat_SOURCES=state.r -state_obj=$(state_dat_SOURCES:.r=.qfo) -state_dep=$(addprefix ./$(DEPDIR)/,$(state_obj:.qfo=.Qo)) -state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(state_obj) -state.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(state_dep) # am--include-marker -r_depfiles_remade += $(state_dep) - -struct_init_param_dat_SOURCES=struct-init-param.r -struct_init_param_obj=$(struct_init_param_dat_SOURCES:.r=.qfo) -struct_init_param_dep=$(addprefix ./$(DEPDIR)/,$(struct_init_param_obj:.qfo=.Qo)) -struct-init-param.dat$(EXEEXT): $(struct_init_param_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(struct_init_param_obj) -struct-init-param.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(struct_init_param_dep) # am--include-marker -r_depfiles_remade += $(struct_init_param_dep) - -struct_nil_init_dat_SOURCES=struct-nil-init.r -struct_nil_init_obj=$(struct_nil_init_dat_SOURCES:.r=.qfo) -struct_nil_init_dep=$(addprefix ./$(DEPDIR)/,$(struct_nil_init_obj:.qfo=.Qo)) -struct-nil-init.dat$(EXEEXT): $(struct_nil_init_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(struct_nil_init_obj) -struct-nil-init.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(struct_nil_init_dep) # am--include-marker -r_depfiles_remade += $(struct_nil_init_dep) - -structarray_dat_SOURCES=structarray.r -structarray_obj=$(structarray_dat_SOURCES:.r=.qfo) -structarray_dep=$(addprefix ./$(DEPDIR)/,$(structarray_obj:.qfo=.Qo)) -structarray.dat$(EXEEXT): $(structarray_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(structarray_obj) -structarray.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(structarray_dep) # am--include-marker -r_depfiles_remade += $(structarray_dep) - -structlive_dat_SOURCES=structlive.r -structlive_obj=$(structlive_dat_SOURCES:.r=.qfo) -structlive_dep=$(addprefix ./$(DEPDIR)/,$(structlive_obj:.qfo=.Qo)) -structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(structlive_obj) -structlive.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(structlive_dep) # am--include-marker -r_depfiles_remade += $(structlive_dep) - -structptr_dat_SOURCES=structptr.r -structptr_obj=$(structptr_dat_SOURCES:.r=.qfo) -structptr_dep=$(addprefix ./$(DEPDIR)/,$(structptr_obj:.qfo=.Qo)) -structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(structptr_obj) -structptr.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(structptr_dep) # am--include-marker -r_depfiles_remade += $(structptr_dep) - -structstruct_dat_SOURCES=structstruct.r -structstruct_obj=$(structstruct_dat_SOURCES:.r=.qfo) -structstruct_dep=$(addprefix ./$(DEPDIR)/,$(structstruct_obj:.qfo=.Qo)) -structstruct.dat$(EXEEXT): $(structstruct_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(structstruct_obj) -structstruct.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(structstruct_dep) # am--include-marker -r_depfiles_remade += $(structstruct_dep) - -swap_dat_SOURCES=swap.r -swap_obj=$(swap_dat_SOURCES:.r=.qfo) -swap_dep=$(addprefix ./$(DEPDIR)/,$(swap_obj:.qfo=.Qo)) -swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(swap_obj) -swap.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(swap_dep) # am--include-marker -r_depfiles_remade += $(swap_dep) - -triangle_dat_SOURCES=triangle.r -triangle_obj=$(triangle_dat_SOURCES:.r=.qfo) -triangle_dep=$(addprefix ./$(DEPDIR)/,$(triangle_obj:.qfo=.Qo)) -triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(triangle_obj) -triangle.run: Makefile build-run - @$(srcdir)/build-run $@ 100000 100000 1.00005 50002.4961 -include $(triangle_dep) # am--include-marker -r_depfiles_remade += $(triangle_dep) - -typedef_dat_SOURCES=typedef.r -typedef_obj=$(typedef_dat_SOURCES:.r=.qfo) -typedef_dep=$(addprefix ./$(DEPDIR)/,$(typedef_obj:.qfo=.Qo)) -typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(typedef_obj) -typedef.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(typedef_dep) # am--include-marker -r_depfiles_remade += $(typedef_dep) - -typelinker_dat_SOURCES=typelinker_a.r typelinker_b.r -typelinker_obj=$(typelinker_dat_SOURCES:.r=.qfo) -typelinker_dep=$(addprefix ./$(DEPDIR)/,$(typelinker_obj:.qfo=.Qo)) -typelinker.dat$(EXEEXT): $(typelinker_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(typelinker_obj) -typelinker.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(typelinker_dep) # am--include-marker -r_depfiles_remade += $(typelinker_dep) - -unaryminus_dat_SOURCES=unaryminus.r -unaryminus_obj=$(unaryminus_dat_SOURCES:.r=.qfo) -unaryminus_dep=$(addprefix ./$(DEPDIR)/,$(unaryminus_obj:.qfo=.Qo)) -unaryminus.dat$(EXEEXT): $(unaryminus_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(unaryminus_obj) -unaryminus.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(unaryminus_dep) # am--include-marker -r_depfiles_remade += $(unaryminus_dep) - -vecaddr_dat_SOURCES=vecaddr.r -vecaddr_obj=$(vecaddr_dat_SOURCES:.r=.qfo) -vecaddr_dep=$(addprefix ./$(DEPDIR)/,$(vecaddr_obj:.qfo=.Qo)) -vecaddr.dat$(EXEEXT): $(vecaddr_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(vecaddr_obj) -vecaddr.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(vecaddr_dep) # am--include-marker -r_depfiles_remade += $(vecaddr_dep) - -vecexpr_dat_SOURCES=vecexpr.r -vecexpr_obj=$(vecexpr_dat_SOURCES:.r=.qfo) -vecexpr_dep=$(addprefix ./$(DEPDIR)/,$(vecexpr_obj:.qfo=.Qo)) -vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj) -vecexpr.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(vecexpr_dep) # am--include-marker -r_depfiles_remade += $(vecexpr_dep) - -vecinit_dat_SOURCES=vecinit.r -vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo) -vecinit_dep=$(addprefix ./$(DEPDIR)/,$(vecinit_obj:.qfo=.Qo)) -vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj) -vecinit.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(vecinit_dep) # am--include-marker -r_depfiles_remade += $(vecinit_dep) - -voidfor_dat_SOURCES=voidfor.r -voidfor_obj=$(voidfor_dat_SOURCES:.r=.qfo) -voidfor_dep=$(addprefix ./$(DEPDIR)/,$(voidfor_obj:.qfo=.Qo)) -voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj) -voidfor.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(voidfor_dep) # am--include-marker -r_depfiles_remade += $(voidfor_dep) - -while_dat_SOURCES=while.r -while_obj=$(while_dat_SOURCES:.r=.qfo) -while_dep=$(addprefix ./$(DEPDIR)/,$(while_obj:.qfo=.Qo)) -while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(while_obj) -while.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(while_dep) # am--include-marker -r_depfiles_remade += $(while_dep) - -zerolinker_dat_SOURCES=zerolinker.r -zerolinker_obj=$(zerolinker_dat_SOURCES:.r=.qfo) -zerolinker_dep=$(addprefix ./$(DEPDIR)/,$(zerolinker_obj:.qfo=.Qo)) -zerolinker.dat$(EXEEXT): $(zerolinker_obj) $(QFCC_DEP) - $(QFCC) $(QCFLAGS) -o $@ $(zerolinker_obj) -zerolinker.run: Makefile build-run - @$(srcdir)/build-run $@ -include $(zerolinker_dep) # am--include-marker -r_depfiles_remade += $(zerolinker_dep) - -$(r_depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - - -am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade) - -EXTRA_DIST= test-bi.h build-run test-defspace.h -CLEANFILES= *.dat *.sym *.qfo *.run *.frame *.log *.trs diff --git a/tools/qfcc/test/Makemodule.am b/tools/qfcc/test/Makemodule.am new file mode 100644 index 000000000..85f94b800 --- /dev/null +++ b/tools/qfcc/test/Makemodule.am @@ -0,0 +1,599 @@ +QFCC_TEST_LIBS=@QFCC_TEST_LIBS@ +QFCC_TEST_DEPS=@QFCC_TEST_DEPS@ +QFCC_TEST_INCS=@QFCC_TEST_INCS@ + +test_bins=\ + tools/qfcc/test/test-defspace + +fail_bins= + +test_progs_dat=\ + tools/qfcc/test/address-cast.dat \ + tools/qfcc/test/alignment.dat \ + tools/qfcc/test/assignchain.dat \ + tools/qfcc/test/anonstruct.dat \ + tools/qfcc/test/chewed-alias.dat \ + tools/qfcc/test/chewed-return.dat \ + tools/qfcc/test/comma-expr.dat \ + tools/qfcc/test/compound.dat \ + tools/qfcc/test/deadbool.dat \ + tools/qfcc/test/double.dat \ + tools/qfcc/test/double-alias.dat \ + tools/qfcc/test/enum.dat \ + tools/qfcc/test/fordecl.dat \ + tools/qfcc/test/func-expr.dat \ + tools/qfcc/test/func-expr2.dat \ + tools/qfcc/test/func-static.dat \ + tools/qfcc/test/gcd.dat \ + tools/qfcc/test/infloop.dat \ + tools/qfcc/test/ivar-struct-return.dat \ + tools/qfcc/test/methodparams.dat \ + tools/qfcc/test/modulo.dat \ + tools/qfcc/test/nilparamret.dat \ + tools/qfcc/test/overload.dat \ + tools/qfcc/test/paramret.dat \ + tools/qfcc/test/quaternion.dat \ + tools/qfcc/test/return-ivar.dat \ + tools/qfcc/test/sendv.dat \ + tools/qfcc/test/state.dat \ + tools/qfcc/test/struct-init-param.dat \ + tools/qfcc/test/struct-nil-init.dat \ + tools/qfcc/test/structarray.dat \ + tools/qfcc/test/structlive.dat \ + tools/qfcc/test/structptr.dat \ + tools/qfcc/test/structstruct.dat \ + tools/qfcc/test/swap.dat \ + tools/qfcc/test/triangle.dat \ + tools/qfcc/test/typedef.dat \ + tools/qfcc/test/typelinker.dat \ + tools/qfcc/test/unaryminus.dat \ + tools/qfcc/test/vecaddr.dat \ + tools/qfcc/test/vecexpr.dat \ + tools/qfcc/test/vecinit.dat \ + tools/qfcc/test/voidfor.dat \ + tools/qfcc/test/while.dat \ + tools/qfcc/test/zerolinker.dat + +fail_progs_dat= + +test_build_errors=\ + tools/qfcc/test/classarray.r \ + tools/qfcc/test/double-demote-float.r \ + tools/qfcc/test/double-demote-float-ainit.r \ + tools/qfcc/test/double-demote-float-ginit.r \ + tools/qfcc/test/double-demote-float-linit.r \ + tools/qfcc/test/double-demote-int.r \ + tools/qfcc/test/double-demote-int-ainit.r \ + tools/qfcc/test/double-demote-int-ginit.r \ + tools/qfcc/test/double-demote-int-linit.r \ + tools/qfcc/test/double-int-compare.r \ + tools/qfcc/test/double-float-compare.r + +fail_build_errors= + +test_defspace_src=\ + tools/qfcc/test/tw-defspace.c tools/qfcc/test/tw-diagnostic.c tools/qfcc/test/tw-strpool.c + +TESTS += \ + $(test_bins) \ + $(test_progs_dat:.dat=.run) \ + $(test_build_errors:.r=.run) +XFAIL_TESTS += \ + $(fail_bins) \ + $(fail_progs_dat:.dat=.run) \ + $(fail_build_errors:.r=.run) + +check_PROGRAMS += \ + tools/qfcc/test/test-harness \ + $(test_progs_dat) \ + $(test_bins) + +tools_qfcc_test_test_defspace_SOURCES= tools/qfcc/test/test-defspace.c $(test_defspace_src) +tools_qfcc_test_test_defspace_LDADD= $(QFCC_LIBS) +tools_qfcc_test_test_defspace_DEPENDENCIES= $(QFCC_DEPS) + +tools_qfcc_test_test_harness_SOURCES= tools/qfcc/test/test-bi.c tools/qfcc/test/test-harness.c +tools_qfcc_test_test_harness_LDADD= $(QFCC_TEST_LIBS) +tools_qfcc_test_test_harness_DEPENDENCIES= $(QFCC_TEST_DEPS) + +qfcc_test_run_deps = Makefile tools/qfcc/test/build-run +qfcc_fail_run_deps = Makefile tools/qfcc/test/build-compile-fail-run +tools_qfcc_test_address_cast_dat_SOURCES=tools/qfcc/test/address-cast.r +address_cast_obj=$(tools_qfcc_test_address_cast_dat_SOURCES:.r=.o) +address_cast_dep=$(call qcautodep,$(tools_qfcc_test_address_cast_dat_SOURCES)) +tools/qfcc/test/address-cast.dat$(EXEEXT): $(address_cast_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(address_cast_obj) +tools/qfcc/test/address-cast.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(address_cast_dep) # am--include-marker +r_depfiles_remade += $(address_cast_dep) + +tools_qfcc_test_alignment_dat_SOURCES=tools/qfcc/test/alignment.r +alignment_obj=$(tools_qfcc_test_alignment_dat_SOURCES:.r=.o) +alignment_dep=$(call qcautodep,$(tools_qfcc_test_alignment_dat_SOURCES)) +tools/qfcc/test/alignment.dat$(EXEEXT): $(alignment_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(alignment_obj) +tools/qfcc/test/alignment.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(alignment_dep) # am--include-marker +r_depfiles_remade += $(alignment_dep) + +tools_qfcc_test_anonstruct_dat_SOURCES=tools/qfcc/test/anonstruct.r +anonstruct_obj=$(tools_qfcc_test_anonstruct_dat_SOURCES:.r=.o) +anonstruct_dep=$(call qcautodep,$(tools_qfcc_test_anonstruct_dat_SOURCES)) +tools/qfcc/test/anonstruct.dat$(EXEEXT): $(anonstruct_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(anonstruct_obj) +tools/qfcc/test/anonstruct.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(anonstruct_dep) # am--include-marker +r_depfiles_remade += $(anonstruct_dep) + +tools_qfcc_test_assignchain_dat_SOURCES=tools/qfcc/test/assignchain.r +assignchain_obj=$(tools_qfcc_test_assignchain_dat_SOURCES:.r=.o) +assignchain_dep=$(call qcautodep,$(tools_qfcc_test_assignchain_dat_SOURCES)) +tools/qfcc/test/assignchain.dat$(EXEEXT): $(assignchain_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(assignchain_obj) +tools/qfcc/test/assignchain.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(assignchain_dep) # am--include-marker +r_depfiles_remade += $(assignchain_dep) + +tools_qfcc_test_chewed_alias_dat_SOURCES=tools/qfcc/test/chewed-alias.r +chewed_alias_obj=$(tools_qfcc_test_chewed_alias_dat_SOURCES:.r=.o) +chewed_alias_dep=$(call qcautodep,$(tools_qfcc_test_chewed_alias_dat_SOURCES)) +tools/qfcc/test/chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj) +tools/qfcc/test/chewed-alias.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(chewed_alias_dep) # am--include-marker +r_depfiles_remade += $(chewed_alias_dep) + +tools_qfcc_test_chewed_return_dat_SOURCES=tools/qfcc/test/chewed-return.r +chewed_return_obj=$(tools_qfcc_test_chewed_return_dat_SOURCES:.r=.o) +chewed_return_dep=$(call qcautodep,$(tools_qfcc_test_chewed_return_dat_SOURCES)) +tools/qfcc/test/chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj) +tools/qfcc/test/chewed-return.run: $(qfcc_test_run_deps) + @TEST_HARNESS_OPTS=--float $(top_srcdir)/tools/qfcc/test/build-run $@ +include $(chewed_return_dep) # am--include-marker +r_depfiles_remade += $(chewed_return_dep) + +tools_qfcc_test_comma_expr_dat_SOURCES=tools/qfcc/test/comma-expr.r +comma_expr_obj=$(tools_qfcc_test_comma_expr_dat_SOURCES:.r=.o) +comma_expr_dep=$(call qcautodep,$(tools_qfcc_test_comma_expr_dat_SOURCES)) +tools/qfcc/test/comma-expr.dat$(EXEEXT): $(comma_expr_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(comma_expr_obj) +tools/qfcc/test/comma-expr.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(comma_expr_dep) # am--include-marker +r_depfiles_remade += $(comma_expr_dep) + +tools_qfcc_test_compound_dat_SOURCES=tools/qfcc/test/compound.r +compound_obj=$(tools_qfcc_test_compound_dat_SOURCES:.r=.o) +compound_dep=$(call qcautodep,$(tools_qfcc_test_compound_dat_SOURCES)) +tools/qfcc/test/compound.dat$(EXEEXT): $(compound_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(compound_obj) +tools/qfcc/test/compound.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(compound_dep) # am--include-marker +r_depfiles_remade += $(compound_dep) + +tools_qfcc_test_deadbool_dat_SOURCES=tools/qfcc/test/deadbool.r +deadbool_obj=$(tools_qfcc_test_deadbool_dat_SOURCES:.r=.o) +deadbool_dep=$(call qcautodep,$(tools_qfcc_test_deadbool_dat_SOURCES)) +tools/qfcc/test/deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj) +tools/qfcc/test/deadbool.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(deadbool_dep) # am--include-marker +r_depfiles_remade += $(deadbool_dep) + +tools_qfcc_test_double_dat_SOURCES=tools/qfcc/test/double.r +double_obj=$(tools_qfcc_test_double_dat_SOURCES:.r=.o) +double_dep=$(call qcautodep,$(tools_qfcc_test_double_dat_SOURCES)) +tools/qfcc/test/double.dat$(EXEEXT): $(double_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(double_obj) +tools/qfcc/test/double.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(double_dep) # am--include-marker +r_depfiles_remade += $(double_dep) + +tools_qfcc_test_double_alias_dat_SOURCES=tools/qfcc/test/double-alias.r +double_alias_obj=$(tools_qfcc_test_double_alias_dat_SOURCES:.r=.o) +double_alias_dep=$(call qcautodep,$(tools_qfcc_test_double_alias_dat_SOURCES)) +tools/qfcc/test/double-alias.dat$(EXEEXT): $(double_alias_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(double_alias_obj) +tools/qfcc/test/double-alias.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(double_alias_dep) # am--include-marker +r_depfiles_remade += $(double_alias_dep) + +tools/qfcc/test/classarray.run$(EXEEXT): tools/qfcc/test/classarray.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools/qfcc/test/double-demote-int.run$(EXEEXT): tools/qfcc/test/double-demote-int.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools/qfcc/test/double-demote-float.run$(EXEEXT): tools/qfcc/test/double-demote-float.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools/qfcc/test/double-demote-int-ainit.run$(EXEEXT): tools/qfcc/test/double-demote-int-ainit.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools/qfcc/test/double-demote-float-ainit.run$(EXEEXT): tools/qfcc/test/double-demote-float-ainit.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools/qfcc/test/double-demote-int-ginit.run$(EXEEXT): tools/qfcc/test/double-demote-int-ginit.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools/qfcc/test/double-demote-float-ginit.run$(EXEEXT): tools/qfcc/test/double-demote-float-ginit.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools/qfcc/test/double-demote-int-linit.run$(EXEEXT): tools/qfcc/test/double-demote-int-linit.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools/qfcc/test/double-demote-float-linit.run$(EXEEXT): tools/qfcc/test/double-demote-float-linit.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools/qfcc/test/double-int-compare.run$(EXEEXT): tools/qfcc/test/double-int-compare.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools/qfcc/test/double-float-compare.run$(EXEEXT): tools/qfcc/test/double-float-compare.r $(qfcc_fail_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-compile-fail-run $@ $(QFCC) $(QCFLAGS) $< + +tools_qfcc_test_enum_dat_SOURCES=tools/qfcc/test/enum.r +enum_obj=$(tools_qfcc_test_enum_dat_SOURCES:.r=.o) +enum_dep=$(call qcautodep,$(tools_qfcc_test_enum_dat_SOURCES)) +tools/qfcc/test/enum.dat$(EXEEXT): $(enum_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(enum_obj) +tools/qfcc/test/enum.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(enum_dep) # am--include-marker +r_depfiles_remade += $(enum_dep) + +tools_qfcc_test_fordecl_dat_SOURCES=tools/qfcc/test/fordecl.r +fordecl_obj=$(tools_qfcc_test_fordecl_dat_SOURCES:.r=.o) +fordecl_dep=$(call qcautodep,$(tools_qfcc_test_fordecl_dat_SOURCES)) +tools/qfcc/test/fordecl.dat$(EXEEXT): $(fordecl_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(fordecl_obj) +tools/qfcc/test/fordecl.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(fordecl_dep) # am--include-marker +r_depfiles_remade += $(fordecl_dep) + +tools_qfcc_test_func_expr_dat_SOURCES=tools/qfcc/test/func-expr.r +func_expr_obj=$(tools_qfcc_test_func_expr_dat_SOURCES:.r=.o) +func_expr_dep=$(call qcautodep,$(tools_qfcc_test_func_expr_dat_SOURCES)) +tools/qfcc/test/func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj) +tools/qfcc/test/func-expr.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(func_expr_dep) # am--include-marker +r_depfiles_remade += $(func_expr_dep) + +tools_qfcc_test_func_expr2_dat_SOURCES=tools/qfcc/test/func-expr2.r +func_expr2_obj=$(tools_qfcc_test_func_expr2_dat_SOURCES:.r=.o) +func_expr2_dep=$(call qcautodep,$(tools_qfcc_test_func_expr2_dat_SOURCES)) +tools/qfcc/test/func-expr2.dat$(EXEEXT): $(func_expr2_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(func_expr2_obj) +tools/qfcc/test/func-expr2.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(func_expr2_dep) # am--include-marker +r_depfiles_remade += $(func_expr2_dep) + +tools_qfcc_test_func_static_dat_SOURCES=tools/qfcc/test/func-static.r +func_static_obj=$(tools_qfcc_test_func_static_dat_SOURCES:.r=.o) +func_static_dep=$(call qcautodep,$(tools_qfcc_test_func_static_dat_SOURCES)) +tools/qfcc/test/func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(func_static_obj) +tools/qfcc/test/func-static.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(func_static_dep) # am--include-marker +r_depfiles_remade += $(func_static_dep) + +tools_qfcc_test_gcd_dat_SOURCES=tools/qfcc/test/gcd.pas +gcd_obj=$(tools_qfcc_test_gcd_dat_SOURCES:.pas=.o) +gcd_dep=$(call qcautodep,$(tools_qfcc_test_gcd_dat_SOURCES)) +tools/qfcc/test/gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(gcd_obj) +tools/qfcc/test/gcd.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(gcd_dep) # am--include-marker +pas_depfiles_remade += $(gcd_dep) + +tools_qfcc_test_infloop_dat_SOURCES=tools/qfcc/test/infloop.r +infloop_obj=$(tools_qfcc_test_infloop_dat_SOURCES:.r=.o) +infloop_dep=$(call qcautodep,$(tools_qfcc_test_infloop_dat_SOURCES)) +tools/qfcc/test/infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(infloop_obj) +tools/qfcc/test/infloop.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(infloop_dep) # am--include-marker +r_depfiles_remade += $(infloop_dep) + +tools_qfcc_test_ivar_struct_return_dat_SOURCES=tools/qfcc/test/ivar-struct-return.r +ivar_struct_return_obj=$(tools_qfcc_test_ivar_struct_return_dat_SOURCES:.r=.o) +ivar_struct_return_dep=$(call qcautodep,$(tools_qfcc_test_ivar_struct_return_dat_SOURCES)) +tools/qfcc/test/ivar-struct-return.dat$(EXEEXT): $(ivar_struct_return_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(ivar_struct_return_obj) +tools/qfcc/test/ivar-struct-return.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(ivar_struct_return_dep) # am--include-marker +r_depfiles_remade += $(ivar_struct_return_dep) + +tools_qfcc_test_methodparams_dat_SOURCES=tools/qfcc/test/methodparams.r +methodparams_obj=$(tools_qfcc_test_methodparams_dat_SOURCES:.r=.o) +methodparams_dep=$(call qcautodep,$(tools_qfcc_test_methodparams_dat_SOURCES)) +tools/qfcc/test/methodparams.dat$(EXEEXT): $(methodparams_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(methodparams_obj) +tools/qfcc/test/methodparams.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(methodparams_dep) # am--include-marker +r_depfiles_remade += $(methodparams_dep) + +tools_qfcc_test_modulo_dat_SOURCES=tools/qfcc/test/modulo.r +modulo_obj=$(tools_qfcc_test_modulo_dat_SOURCES:.r=.o) +modulo_dep=$(call qcautodep,$(tools_qfcc_test_modulo_dat_SOURCES)) +tools/qfcc/test/modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(modulo_obj) +tools/qfcc/test/modulo.run: $(qfcc_test_run_deps) + @TEST_HARNESS_OPTS=--float $(top_srcdir)/tools/qfcc/test/build-run $@ +include $(modulo_dep) # am--include-marker +r_depfiles_remade += $(modulo_dep) + +tools_qfcc_test_nilparamret_dat_SOURCES=tools/qfcc/test/nilparamret.r +nilparamret_obj=$(tools_qfcc_test_nilparamret_dat_SOURCES:.r=.o) +nilparamret_dep=$(call qcautodep,$(tools_qfcc_test_nilparamret_dat_SOURCES)) +tools/qfcc/test/nilparamret.dat$(EXEEXT): $(nilparamret_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(nilparamret_obj) +tools/qfcc/test/nilparamret.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(nilparamret_dep) # am--include-marker +r_depfiles_remade += $(nilparamret_dep) + +tools_qfcc_test_overload_dat_SOURCES=tools/qfcc/test/overload.r +overload_obj=$(tools_qfcc_test_overload_dat_SOURCES:.r=.o) +overload_dep=$(call qcautodep,$(tools_qfcc_test_overload_dat_SOURCES)) +tools/qfcc/test/overload.dat$(EXEEXT): $(overload_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(overload_obj) +tools/qfcc/test/overload.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(overload_dep) # am--include-marker +r_depfiles_remade += $(overload_dep) + +tools_qfcc_test_paramret_dat_SOURCES=tools/qfcc/test/paramret.r +paramret_obj=$(tools_qfcc_test_paramret_dat_SOURCES:.r=.o) +paramret_dep=$(call qcautodep,$(tools_qfcc_test_paramret_dat_SOURCES)) +tools/qfcc/test/paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(paramret_obj) +tools/qfcc/test/paramret.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(paramret_dep) # am--include-marker +r_depfiles_remade += $(paramret_dep) + +tools_qfcc_test_quaternion_dat_SOURCES=tools/qfcc/test/quaternion.r +quaternion_obj=$(tools_qfcc_test_quaternion_dat_SOURCES:.r=.o) +quaternion_dep=$(call qcautodep,$(tools_qfcc_test_quaternion_dat_SOURCES)) +tools/qfcc/test/quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj) +tools/qfcc/test/quaternion.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(quaternion_dep) # am--include-marker +r_depfiles_remade += $(quaternion_dep) + +tools_qfcc_test_return_ivar_dat_SOURCES=tools/qfcc/test/return-ivar.r +return_ivar_obj=$(tools_qfcc_test_return_ivar_dat_SOURCES:.r=.o) +return_ivar_dep=$(call qcautodep,$(tools_qfcc_test_return_ivar_dat_SOURCES)) +tools/qfcc/test/return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj) +tools/qfcc/test/return-ivar.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(return_ivar_dep) # am--include-marker +r_depfiles_remade += $(return_ivar_dep) + +tools_qfcc_test_sendv_dat_SOURCES=tools/qfcc/test/sendv.r +sendv_obj=$(tools_qfcc_test_sendv_dat_SOURCES:.r=.o) +sendv_dep=$(call qcautodep,$(tools_qfcc_test_sendv_dat_SOURCES)) +tools/qfcc/test/sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(sendv_obj) +tools/qfcc/test/sendv.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(sendv_dep) # am--include-marker +r_depfiles_remade += $(sendv_dep) + +tools_qfcc_test_state_dat_SOURCES=tools/qfcc/test/state.r +state_obj=$(tools_qfcc_test_state_dat_SOURCES:.r=.o) +state_dep=$(call qcautodep,$(tools_qfcc_test_state_dat_SOURCES)) +tools/qfcc/test/state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(state_obj) +tools/qfcc/test/state.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(state_dep) # am--include-marker +r_depfiles_remade += $(state_dep) + +tools_qfcc_test_struct_init_param_dat_SOURCES=tools/qfcc/test/struct-init-param.r +struct_init_param_obj=$(tools_qfcc_test_struct_init_param_dat_SOURCES:.r=.o) +struct_init_param_dep=$(call qcautodep,$(tools_qfcc_test_struct_init_param_dat_SOURCES)) +tools/qfcc/test/struct-init-param.dat$(EXEEXT): $(struct_init_param_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(struct_init_param_obj) +tools/qfcc/test/struct-init-param.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(struct_init_param_dep) # am--include-marker +r_depfiles_remade += $(struct_init_param_dep) + +tools_qfcc_test_struct_nil_init_dat_SOURCES=tools/qfcc/test/struct-nil-init.r +struct_nil_init_obj=$(tools_qfcc_test_struct_nil_init_dat_SOURCES:.r=.o) +struct_nil_init_dep=$(call qcautodep,$(tools_qfcc_test_struct_nil_init_dat_SOURCES)) +tools/qfcc/test/struct-nil-init.dat$(EXEEXT): $(struct_nil_init_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(struct_nil_init_obj) +tools/qfcc/test/struct-nil-init.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(struct_nil_init_dep) # am--include-marker +r_depfiles_remade += $(struct_nil_init_dep) + +tools_qfcc_test_structarray_dat_SOURCES=tools/qfcc/test/structarray.r +structarray_obj=$(tools_qfcc_test_structarray_dat_SOURCES:.r=.o) +structarray_dep=$(call qcautodep,$(tools_qfcc_test_structarray_dat_SOURCES)) +tools/qfcc/test/structarray.dat$(EXEEXT): $(structarray_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(structarray_obj) +tools/qfcc/test/structarray.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(structarray_dep) # am--include-marker +r_depfiles_remade += $(structarray_dep) + +tools_qfcc_test_structlive_dat_SOURCES=tools/qfcc/test/structlive.r +structlive_obj=$(tools_qfcc_test_structlive_dat_SOURCES:.r=.o) +structlive_dep=$(call qcautodep,$(tools_qfcc_test_structlive_dat_SOURCES)) +tools/qfcc/test/structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(structlive_obj) +tools/qfcc/test/structlive.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(structlive_dep) # am--include-marker +r_depfiles_remade += $(structlive_dep) + +tools_qfcc_test_structptr_dat_SOURCES=tools/qfcc/test/structptr.r +structptr_obj=$(tools_qfcc_test_structptr_dat_SOURCES:.r=.o) +structptr_dep=$(call qcautodep,$(tools_qfcc_test_structptr_dat_SOURCES)) +tools/qfcc/test/structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(structptr_obj) +tools/qfcc/test/structptr.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(structptr_dep) # am--include-marker +r_depfiles_remade += $(structptr_dep) + +tools_qfcc_test_structstruct_dat_SOURCES=tools/qfcc/test/structstruct.r +structstruct_obj=$(tools_qfcc_test_structstruct_dat_SOURCES:.r=.o) +structstruct_dep=$(call qcautodep,$(tools_qfcc_test_structstruct_dat_SOURCES)) +tools/qfcc/test/structstruct.dat$(EXEEXT): $(structstruct_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(structstruct_obj) +tools/qfcc/test/structstruct.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(structstruct_dep) # am--include-marker +r_depfiles_remade += $(structstruct_dep) + +tools_qfcc_test_swap_dat_SOURCES=tools/qfcc/test/swap.r +swap_obj=$(tools_qfcc_test_swap_dat_SOURCES:.r=.o) +swap_dep=$(call qcautodep,$(tools_qfcc_test_swap_dat_SOURCES)) +tools/qfcc/test/swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(swap_obj) +tools/qfcc/test/swap.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(swap_dep) # am--include-marker +r_depfiles_remade += $(swap_dep) + +tools_qfcc_test_triangle_dat_SOURCES=tools/qfcc/test/triangle.r +triangle_obj=$(tools_qfcc_test_triangle_dat_SOURCES:.r=.o) +triangle_dep=$(call qcautodep,$(tools_qfcc_test_triangle_dat_SOURCES)) +tools/qfcc/test/triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(triangle_obj) +tools/qfcc/test/triangle.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ 100000 100000 1.00005 50002.4961 +include $(triangle_dep) # am--include-marker +r_depfiles_remade += $(triangle_dep) + +tools_qfcc_test_typedef_dat_SOURCES=tools/qfcc/test/typedef.r +typedef_obj=$(tools_qfcc_test_typedef_dat_SOURCES:.r=.o) +typedef_dep=$(call qcautodep,$(tools_qfcc_test_typedef_dat_SOURCES)) +tools/qfcc/test/typedef.dat$(EXEEXT): $(typedef_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(typedef_obj) +tools/qfcc/test/typedef.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(typedef_dep) # am--include-marker +r_depfiles_remade += $(typedef_dep) + +tools_qfcc_test_typelinker_dat_SOURCES=tools/qfcc/test/typelinker_a.r tools/qfcc/test/typelinker_b.r +typelinker_obj=$(tools_qfcc_test_typelinker_dat_SOURCES:.r=.o) +typelinker_dep=$(call qcautodep,$(tools_qfcc_test_typelinker_dat_SOURCES)) +tools/qfcc/test/typelinker.dat$(EXEEXT): $(typelinker_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(typelinker_obj) +tools/qfcc/test/typelinker.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(typelinker_dep) # am--include-marker +r_depfiles_remade += $(typelinker_dep) + +tools_qfcc_test_unaryminus_dat_SOURCES=tools/qfcc/test/unaryminus.r +unaryminus_obj=$(tools_qfcc_test_unaryminus_dat_SOURCES:.r=.o) +unaryminus_dep=$(call qcautodep,$(tools_qfcc_test_unaryminus_dat_SOURCES)) +tools/qfcc/test/unaryminus.dat$(EXEEXT): $(unaryminus_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(unaryminus_obj) +tools/qfcc/test/unaryminus.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(unaryminus_dep) # am--include-marker +r_depfiles_remade += $(unaryminus_dep) + +tools_qfcc_test_vecaddr_dat_SOURCES=tools/qfcc/test/vecaddr.r +vecaddr_obj=$(tools_qfcc_test_vecaddr_dat_SOURCES:.r=.o) +vecaddr_dep=$(call qcautodep,$(tools_qfcc_test_vecaddr_dat_SOURCES)) +tools/qfcc/test/vecaddr.dat$(EXEEXT): $(vecaddr_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(vecaddr_obj) +tools/qfcc/test/vecaddr.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(vecaddr_dep) # am--include-marker +r_depfiles_remade += $(vecaddr_dep) + +tools_qfcc_test_vecexpr_dat_SOURCES=tools/qfcc/test/vecexpr.r +vecexpr_obj=$(tools_qfcc_test_vecexpr_dat_SOURCES:.r=.o) +vecexpr_dep=$(call qcautodep,$(tools_qfcc_test_vecexpr_dat_SOURCES)) +tools/qfcc/test/vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj) +tools/qfcc/test/vecexpr.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(vecexpr_dep) # am--include-marker +r_depfiles_remade += $(vecexpr_dep) + +tools_qfcc_test_vecinit_dat_SOURCES=tools/qfcc/test/vecinit.r +vecinit_obj=$(tools_qfcc_test_vecinit_dat_SOURCES:.r=.o) +vecinit_dep=$(call qcautodep,$(tools_qfcc_test_vecinit_dat_SOURCES)) +tools/qfcc/test/vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj) +tools/qfcc/test/vecinit.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(vecinit_dep) # am--include-marker +r_depfiles_remade += $(vecinit_dep) + +tools_qfcc_test_voidfor_dat_SOURCES=tools/qfcc/test/voidfor.r +voidfor_obj=$(tools_qfcc_test_voidfor_dat_SOURCES:.r=.o) +voidfor_dep=$(call qcautodep,$(tools_qfcc_test_voidfor_dat_SOURCES)) +tools/qfcc/test/voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj) +tools/qfcc/test/voidfor.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(voidfor_dep) # am--include-marker +r_depfiles_remade += $(voidfor_dep) + +tools_qfcc_test_while_dat_SOURCES=tools/qfcc/test/while.r +while_obj=$(tools_qfcc_test_while_dat_SOURCES:.r=.o) +while_dep=$(call qcautodep,$(tools_qfcc_test_while_dat_SOURCES)) +tools/qfcc/test/while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(while_obj) +tools/qfcc/test/while.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(while_dep) # am--include-marker +r_depfiles_remade += $(while_dep) + +tools_qfcc_test_zerolinker_dat_SOURCES=tools/qfcc/test/zerolinker.r +zerolinker_obj=$(tools_qfcc_test_zerolinker_dat_SOURCES:.r=.o) +zerolinker_dep=$(call qcautodep,$(tools_qfcc_test_zerolinker_dat_SOURCES)) +tools/qfcc/test/zerolinker.dat$(EXEEXT): $(zerolinker_obj) $(QFCC_DEP) + $(QFCC) $(QCFLAGS) -o $@ $(zerolinker_obj) +tools/qfcc/test/zerolinker.run: $(qfcc_test_run_deps) + @$(top_srcdir)/tools/qfcc/test/build-run $@ +include $(zerolinker_dep) # am--include-marker +r_depfiles_remade += $(zerolinker_dep) + +EXTRA_DIST += \ + $(test_build_errors) \ + tools/qfcc/test/build-compile-fail-run \ + tools/qfcc/test/test-bi.h \ + tools/qfcc/test/build-run \ + tools/qfcc/test/test-defspace.h \ + tools/qfcc/test/test-harness.h \ + tools/qfcc/test/typelinker.h + +CLEANFILES += \ + tools/qfcc/test/*.dat \ + tools/qfcc/test/*.sym \ + tools/qfcc/test/*.run \ + tools/qfcc/test/*.frame \ + tools/qfcc/test/*.log \ + tools/qfcc/test/*.trs diff --git a/tools/qfcc/test/build-run b/tools/qfcc/test/build-run index 577355a80..b93854bf9 100755 --- a/tools/qfcc/test/build-run +++ b/tools/qfcc/test/build-run @@ -1,11 +1,11 @@ #! /bin/sh script=$1 -progs=`basename $script .run`.dat +progs=tools/qfcc/test/`basename $script .run`.dat shift cat > $script < #include -#include "class.h" -#include "expr.h" -#include "function.h" -#include "options.h" -#include "strpool.h" -#include "qfcc.h" +#include "tools/qfcc/include/class.h" +#include "tools/qfcc/include/expr.h" +#include "tools/qfcc/include/function.h" +#include "tools/qfcc/include/options.h" +#include "tools/qfcc/include/strpool.h" +#include "tools/qfcc/include/qfcc.h" -#include "test-defspace.h" +#include "tools/qfcc/test/test-defspace.h" options_t options; pr_info_t pr; diff --git a/tools/qfcc/test/test-defspace.h b/tools/qfcc/test/test-defspace.h index 1735003bf..ab6fcd1e8 100644 --- a/tools/qfcc/test/test-defspace.h +++ b/tools/qfcc/test/test-defspace.h @@ -1,5 +1,5 @@ -#include "def.h" -#include "defspace.h" +#include "tools/qfcc/include/def.h" +#include "tools/qfcc/include/defspace.h" int def_list_is_empty (const defspace_t *space); int def_list_is_valid (const defspace_t *space); diff --git a/tools/qflight/Makefile.am b/tools/qflight/Makefile.am deleted file mode 100644 index e4102a7e9..000000000 --- a/tools/qflight/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= include source - -man_MANS= qflight.1 - -EXTRA_DIST= qflight.1 diff --git a/tools/qflight/Makemodule.am b/tools/qflight/Makemodule.am new file mode 100644 index 000000000..cd4d971c6 --- /dev/null +++ b/tools/qflight/Makemodule.am @@ -0,0 +1,4 @@ +include tools/qflight/include/Makemodule.am +include tools/qflight/source/Makemodule.am + +man_MANS += tools/qflight/qflight.1 diff --git a/tools/qflight/include/Makefile.am b/tools/qflight/include/Makefile.am deleted file mode 100644 index 3d7e10861..000000000 --- a/tools/qflight/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -EXTRA_DIST= entities.h light.h noise.h options.h properties.h threads.h diff --git a/tools/qflight/include/Makemodule.am b/tools/qflight/include/Makemodule.am new file mode 100644 index 000000000..747bdca73 --- /dev/null +++ b/tools/qflight/include/Makemodule.am @@ -0,0 +1,7 @@ +EXTRA_DIST += \ + tools/qflight/include/entities.h \ + tools/qflight/include/light.h \ + tools/qflight/include/noise.h \ + tools/qflight/include/options.h \ + tools/qflight/include/properties.h \ + tools/qflight/include/threads.h diff --git a/tools/qflight/source/Makefile.am b/tools/qflight/source/Makefile.am deleted file mode 100644 index cdf5005fb..000000000 --- a/tools/qflight/source/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -QFLIGHT_LIBS=@QFLIGHT_LIBS@ -QFLIGHT_DEPS=@QFLIGHT_DEPS@ -QFLIGHT_INCS=@QFLIGHT_INCS@ -PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@ -PTHREAD_CFLAGS=@PTHREAD_CFLAGS@ - -AM_CPPFLAGS= -I$(top_srcdir)/include $(QFLIGHT_INCS) $(PTHREAD_CFLAGS) - -bin_PROGRAMS= qflight - -qflight_SOURCES=\ - entities.c ltface.c noise.c options.c properties.c qflight.c \ - threads.c trace.c vis.c - - -qflight_LDFLAGS= $(PTHREAD_LDFLAGS) -qflight_LDADD= $(QFLIGHT_LIBS) -qflight_DEPENDENCIES= $(QFLIGHT_DEPS) diff --git a/tools/qflight/source/Makemodule.am b/tools/qflight/source/Makemodule.am new file mode 100644 index 000000000..0913e37a8 --- /dev/null +++ b/tools/qflight/source/Makemodule.am @@ -0,0 +1,20 @@ +QFLIGHT_LIBS=@QFLIGHT_LIBS@ +QFLIGHT_DEPS=@QFLIGHT_DEPS@ +QFLIGHT_INCS=@QFLIGHT_INCS@ + +bin_PROGRAMS += qflight + +qflight_SOURCES=\ + tools/qflight/source/entities.c \ + tools/qflight/source/ltface.c \ + tools/qflight/source/noise.c \ + tools/qflight/source/options.c \ + tools/qflight/source/properties.c \ + tools/qflight/source/qflight.c \ + tools/qflight/source/threads.c \ + tools/qflight/source/trace.c \ + tools/qflight/source/vis.c + +qflight_LDFLAGS= $(PTHREAD_LDFLAGS) +qflight_LDADD= $(QFLIGHT_LIBS) +qflight_DEPENDENCIES= $(QFLIGHT_DEPS) diff --git a/tools/qflight/source/entities.c b/tools/qflight/source/entities.c index 01c36077c..c9d262356 100644 --- a/tools/qflight/source/entities.c +++ b/tools/qflight/source/entities.c @@ -55,11 +55,11 @@ #include "QF/sys.h" #include "QF/va.h" -#include "light.h" -#include "threads.h" -#include "entities.h" -#include "options.h" -#include "properties.h" +#include "tools/qflight/include/light.h" +#include "tools/qflight/include/threads.h" +#include "tools/qflight/include/entities.h" +#include "tools/qflight/include/options.h" +#include "tools/qflight/include/properties.h" entity_t *entities; int num_entities; diff --git a/tools/qflight/source/ltface.c b/tools/qflight/source/ltface.c index 1864b7746..2b8eb1953 100644 --- a/tools/qflight/source/ltface.c +++ b/tools/qflight/source/ltface.c @@ -52,11 +52,11 @@ #include "compat.h" -#include "light.h" -#include "entities.h" -#include "noise.h" -#include "options.h" -#include "threads.h" +#include "tools/qflight/include/light.h" +#include "tools/qflight/include/entities.h" +#include "tools/qflight/include/noise.h" +#include "tools/qflight/include/options.h" +#include "tools/qflight/include/threads.h" int c_bad; int c_culldistplane, c_proper; diff --git a/tools/qflight/source/noise.c b/tools/qflight/source/noise.c index 8d8a87758..b34e31ee1 100644 --- a/tools/qflight/source/noise.c +++ b/tools/qflight/source/noise.c @@ -35,7 +35,7 @@ #include "QF/qtypes.h" -#include "noise.h" +#include "tools/qflight/include/noise.h" // returns the 3D noise value for a point in space float diff --git a/tools/qflight/source/options.c b/tools/qflight/source/options.c index 88a3584b9..b50753169 100644 --- a/tools/qflight/source/options.c +++ b/tools/qflight/source/options.c @@ -44,9 +44,9 @@ #include "compat.h" -#include "entities.h" -#include "options.h" -#include "properties.h" +#include "tools/qflight/include/entities.h" +#include "tools/qflight/include/options.h" +#include "tools/qflight/include/properties.h" const char *this_program; diff --git a/tools/qflight/source/properties.c b/tools/qflight/source/properties.c index 5cf957b7f..e7774f6d4 100644 --- a/tools/qflight/source/properties.c +++ b/tools/qflight/source/properties.c @@ -46,10 +46,10 @@ #include "compat.h" -#include "entities.h" -#include "light.h" -#include "options.h" -#include "properties.h" +#include "tools/qflight/include/entities.h" +#include "tools/qflight/include/light.h" +#include "tools/qflight/include/options.h" +#include "tools/qflight/include/properties.h" static plitem_t *properties; diff --git a/tools/qflight/source/qflight.c b/tools/qflight/source/qflight.c index 62eda9af1..4d2acfb73 100644 --- a/tools/qflight/source/qflight.c +++ b/tools/qflight/source/qflight.c @@ -53,11 +53,11 @@ #include "QF/sys.h" #include "QF/va.h" -#include "light.h" -#include "threads.h" -#include "entities.h" -#include "options.h" -#include "properties.h" +#include "tools/qflight/include/light.h" +#include "tools/qflight/include/threads.h" +#include "tools/qflight/include/entities.h" +#include "tools/qflight/include/options.h" +#include "tools/qflight/include/properties.h" options_t options; bsp_t *bsp; diff --git a/tools/qflight/source/threads.c b/tools/qflight/source/threads.c index 50e2709a0..8438f7b8e 100644 --- a/tools/qflight/source/threads.c +++ b/tools/qflight/source/threads.c @@ -46,9 +46,9 @@ #include "QF/qtypes.h" #include "QF/qendian.h" -#include "light.h" -#include "options.h" -#include "threads.h" +#include "tools/qflight/include/light.h" +#include "tools/qflight/include/options.h" +#include "tools/qflight/include/threads.h" #if defined (HAVE_PTHREAD_H) && defined (HAVE_PTHREAD) pthread_mutex_t *my_mutex; diff --git a/tools/qflight/source/trace.c b/tools/qflight/source/trace.c index 0f9df661e..aa5b4ce19 100644 --- a/tools/qflight/source/trace.c +++ b/tools/qflight/source/trace.c @@ -50,8 +50,8 @@ #include "QF/quakefs.h" #include "QF/sys.h" -#include "light.h" -#include "options.h" +#include "tools/qflight/include/light.h" +#include "tools/qflight/include/options.h" typedef struct { int type; diff --git a/tools/qflight/source/vis.c b/tools/qflight/source/vis.c index e8267146c..a4f0e1114 100644 --- a/tools/qflight/source/vis.c +++ b/tools/qflight/source/vis.c @@ -47,10 +47,10 @@ #include "QF/bspfile.h" #include "QF/mathlib.h" -#include "entities.h" -#include "light.h" -#include "options.h" -#include "threads.h" +#include "tools/qflight/include/entities.h" +#include "tools/qflight/include/light.h" +#include "tools/qflight/include/options.h" +#include "tools/qflight/include/threads.h" static struct { int empty; diff --git a/tools/qflmp/Makefile.am b/tools/qflmp/Makefile.am deleted file mode 100644 index b9436172c..000000000 --- a/tools/qflmp/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -QFLMP_LIBS=@QFLMP_LIBS@ -QFLMP_DEPS=@QFLMP_DEPS@ -QFLMP_INCS=@QFLMP_INCS@ - -AM_CPPFLAGS= -I$(top_srcdir)/include $(QFLMP_INCS) - -bin_PROGRAMS= qflmp - -#mans=qflmp.1 -man_MANS= $(mans) - -qflmp_SOURCES= lmp.c -qflmp_LDADD= $(QFLMP_LIBS) -qflmp_DEPENDENCIES= $(QFLMP_DEPS) - -EXTRA_DIST= lmp.h #lmp.1 diff --git a/tools/qflmp/Makemodule.am b/tools/qflmp/Makemodule.am new file mode 100644 index 000000000..78dd3a233 --- /dev/null +++ b/tools/qflmp/Makemodule.am @@ -0,0 +1,14 @@ +QFLMP_LIBS=@QFLMP_LIBS@ +QFLMP_DEPS=@QFLMP_DEPS@ +QFLMP_INCS=@QFLMP_INCS@ + +bin_PROGRAMS += qflmp + +#mans=qflmp.1 +man_MANS += $(mans) + +qflmp_SOURCES= tools/qflmp/lmp.c +qflmp_LDADD= $(QFLMP_LIBS) +qflmp_DEPENDENCIES= $(QFLMP_DEPS) + +EXTRA_DIST += tools/qflmp/lmp.h #lmp.1 diff --git a/tools/qfmodelgen/Makefile.am b/tools/qfmodelgen/Makefile.am deleted file mode 100644 index e5b93df89..000000000 --- a/tools/qfmodelgen/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= include source - -#man_MANS= qfmodelgen.1 - -#EXTRA_DIST= $(man_MANS) diff --git a/tools/qfmodelgen/Makemodule.am b/tools/qfmodelgen/Makemodule.am new file mode 100644 index 000000000..d397b4f91 --- /dev/null +++ b/tools/qfmodelgen/Makemodule.am @@ -0,0 +1,2 @@ +include tools/qfmodelgen/include/Makemodule.am +include tools/qfmodelgen/source/Makemodule.am diff --git a/tools/qfmodelgen/include/Makefile.am b/tools/qfmodelgen/include/Makefile.am deleted file mode 100644 index c4cc81268..000000000 --- a/tools/qfmodelgen/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -EXTRA_DIST= lbmlib.h trilib.h diff --git a/tools/qfmodelgen/include/Makemodule.am b/tools/qfmodelgen/include/Makemodule.am new file mode 100644 index 000000000..0a5f0306d --- /dev/null +++ b/tools/qfmodelgen/include/Makemodule.am @@ -0,0 +1,3 @@ +EXTRA_DIST += \ + tools/qfmodelgen/include/lbmlib.h \ + tools/qfmodelgen/include/trilib.h diff --git a/tools/qfmodelgen/source/Makefile.am b/tools/qfmodelgen/source/Makemodule.am similarity index 54% rename from tools/qfmodelgen/source/Makefile.am rename to tools/qfmodelgen/source/Makemodule.am index 4bc3a0bda..9ca6ae7ef 100644 --- a/tools/qfmodelgen/source/Makefile.am +++ b/tools/qfmodelgen/source/Makemodule.am @@ -1,14 +1,13 @@ -AUTOMAKE_OPTIONS= foreign - QFMODELGEN_LIBS=@QFMODELGEN_LIBS@ QFMODELGEN_DEPS=@QFMODELGEN_DEPS@ QFMODELGEN_INCS=@QFMODELGEN_INCS@ -AM_CPPFLAGS= -I$(top_srcdir)/include $(QFMODELGEN_INCS) +bin_PROGRAMS += qfmodelgen -bin_PROGRAMS= qfmodelgen - -qfmodelgen_SOURCES= lbmlib.c modelgen.c trilib.c +qfmodelgen_SOURCES = \ + tools/qfmodelgen/source/lbmlib.c \ + tools/qfmodelgen/source/modelgen.c \ + tools/qfmodelgen/source/trilib.c qfmodelgen_LDADD= $(QFMODELGEN_LIBS) qfmodelgen_DEPENDENCIES= $(QFMODELGEN_DEPS) diff --git a/tools/qfmodelgen/source/lbmlib.c b/tools/qfmodelgen/source/lbmlib.c index 77af86e92..1650bda86 100644 --- a/tools/qfmodelgen/source/lbmlib.c +++ b/tools/qfmodelgen/source/lbmlib.c @@ -30,7 +30,7 @@ #include "QF/quakeio.h" #include "QF/sys.h" -#include "lbmlib.h" +#include "tools/qfmodelgen/include/lbmlib.h" static int LoadFile (const char *fname, byte **buf) diff --git a/tools/qfmodelgen/source/modelgen.c b/tools/qfmodelgen/source/modelgen.c index 4905ad041..5d3eee4d0 100644 --- a/tools/qfmodelgen/source/modelgen.c +++ b/tools/qfmodelgen/source/modelgen.c @@ -45,10 +45,11 @@ #include "QF/script.h" #include "QF/sys.h" -#include "lbmlib.h" -#include "trilib.h" #include "compat.h" +#include "tools/qfmodelgen/include/lbmlib.h" +#include "tools/qfmodelgen/include/trilib.h" + #define MAXVERTS 2048 #define MAXFRAMES 256 #define MAXSKINS 100 diff --git a/tools/qfmodelgen/source/trilib.c b/tools/qfmodelgen/source/trilib.c index 41f6ffd42..a22721192 100644 --- a/tools/qfmodelgen/source/trilib.c +++ b/tools/qfmodelgen/source/trilib.c @@ -31,7 +31,7 @@ #include "QF/quakeio.h" #include "QF/sys.h" -#include "trilib.h" +#include "tools/qfmodelgen/include/trilib.h" // on disk representation of a face diff --git a/tools/qfspritegen/Makefile.am b/tools/qfspritegen/Makemodule.am similarity index 57% rename from tools/qfspritegen/Makefile.am rename to tools/qfspritegen/Makemodule.am index 05f321022..a12777453 100644 --- a/tools/qfspritegen/Makefile.am +++ b/tools/qfspritegen/Makemodule.am @@ -1,14 +1,10 @@ -AUTOMAKE_OPTIONS= foreign - QFSPRITEGEN_LIBS=@QFSPRITEGEN_LIBS@ QFSPRITEGEN_DEPS=@QFSPRITEGEN_DEPS@ QFSPRITEGEN_INCS=@QFSPRITEGEN_INCS@ -AM_CPPFLAGS= -I$(top_srcdir)/include $(QFSPRITEGEN_INCS) +bin_PROGRAMS += qfspritegen -bin_PROGRAMS= qfspritegen - -qfspritegen_SOURCES= spritegen.c +qfspritegen_SOURCES= tools/qfspritegen/spritegen.c qfspritegen_LDADD= $(QFSPRITEGEN_LIBS) qfspritegen_DEPENDENCIES= $(QFSPRITEGEN_DEPS) diff --git a/tools/qfvis/Makefile.am b/tools/qfvis/Makefile.am deleted file mode 100644 index 52a798c6e..000000000 --- a/tools/qfvis/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -SUBDIRS= include source - -mans=qfvis.1 -man_MANS= $(mans) -EXTRA_DIST= $(mans) diff --git a/tools/qfvis/Makemodule.am b/tools/qfvis/Makemodule.am new file mode 100644 index 000000000..5840ea1f6 --- /dev/null +++ b/tools/qfvis/Makemodule.am @@ -0,0 +1,4 @@ +include tools/qfvis/include/Makemodule.am +include tools/qfvis/source/Makemodule.am + +man_MANS += tools/qfvis/qfvis.1 diff --git a/tools/qfvis/include/Makefile.am b/tools/qfvis/include/Makefile.am deleted file mode 100644 index 0bbb6480b..000000000 --- a/tools/qfvis/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -EXTRA_DIST= options.h vis.h diff --git a/tools/qfvis/include/Makemodule.am b/tools/qfvis/include/Makemodule.am new file mode 100644 index 000000000..eec0af5b0 --- /dev/null +++ b/tools/qfvis/include/Makemodule.am @@ -0,0 +1,3 @@ +EXTRA_DIST += \ + tools/qfvis/include/options.h \ + tools/qfvis/include/vis.h diff --git a/tools/qfvis/source/Makefile.am b/tools/qfvis/source/Makefile.am deleted file mode 100644 index e0a725ca0..000000000 --- a/tools/qfvis/source/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -QFVIS_LIBS=@QFVIS_LIBS@ -QFVIS_DEPS=@QFVIS_DEPS@ -QFVIS_INCS=@QFVIS_INCS@ -PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@ -PTHREAD_CFLAGS=@PTHREAD_CFLAGS@ - -AM_CPPFLAGS= -I$(top_srcdir)/include $(QFVIS_INCS) $(PTHREAD_CFLAGS) - -bin_PROGRAMS= qfvis - -qfvis_SOURCES= base-vis.c flow.c options.c qfvis.c soundphs.c - -qfvis_LDFLAGS= $(PTHREAD_LDFLAGS) -qfvis_LDADD= $(QFVIS_LIBS) -qfvis_DEPENDENCIES= $(QFVIS_DEPS) diff --git a/tools/qfvis/source/Makemodule.am b/tools/qfvis/source/Makemodule.am new file mode 100644 index 000000000..73ccf547e --- /dev/null +++ b/tools/qfvis/source/Makemodule.am @@ -0,0 +1,16 @@ +QFVIS_LIBS=@QFVIS_LIBS@ +QFVIS_DEPS=@QFVIS_DEPS@ +QFVIS_INCS=@QFVIS_INCS@ + +bin_PROGRAMS += qfvis + +qfvis_SOURCES = \ + tools/qfvis/source/base-vis.c \ + tools/qfvis/source/flow.c \ + tools/qfvis/source/options.c \ + tools/qfvis/source/qfvis.c \ + tools/qfvis/source/soundphs.c + +qfvis_LDFLAGS= $(PTHREAD_LDFLAGS) +qfvis_LDADD= $(QFVIS_LIBS) +qfvis_DEPENDENCIES= $(QFVIS_DEPS) diff --git a/tools/qfvis/source/base-vis.c b/tools/qfvis/source/base-vis.c index ca4d912e0..99d5934df 100644 --- a/tools/qfvis/source/base-vis.c +++ b/tools/qfvis/source/base-vis.c @@ -54,8 +54,8 @@ #include "QF/quakefs.h" #include "QF/sys.h" -#include "vis.h" -#include "options.h" +#include "tools/qfvis/include/vis.h" +#include "tools/qfvis/include/options.h" /* This is a rough first-order aproximation that is used to trivially reject diff --git a/tools/qfvis/source/flow.c b/tools/qfvis/source/flow.c index 15af6524f..030ca7a43 100644 --- a/tools/qfvis/source/flow.c +++ b/tools/qfvis/source/flow.c @@ -55,8 +55,8 @@ #include "QF/quakefs.h" #include "QF/sys.h" -#include "vis.h" -#include "options.h" +#include "tools/qfvis/include/vis.h" +#include "tools/qfvis/include/options.h" static int CheckStack (cluster_t *cluster, threaddata_t *thread) diff --git a/tools/qfvis/source/options.c b/tools/qfvis/source/options.c index 048f604b0..d9a5e3691 100644 --- a/tools/qfvis/source/options.c +++ b/tools/qfvis/source/options.c @@ -41,8 +41,8 @@ #include "QF/dstring.h" -#include "options.h" -#include "vis.h" +#include "tools/qfvis/include/options.h" +#include "tools/qfvis/include/vis.h" const char *this_program; diff --git a/tools/qfvis/source/qfvis.c b/tools/qfvis/source/qfvis.c index 8c2cc6ed3..9ffb09e35 100644 --- a/tools/qfvis/source/qfvis.c +++ b/tools/qfvis/source/qfvis.c @@ -57,8 +57,8 @@ #include "QF/quakefs.h" #include "QF/sys.h" -#include "vis.h" -#include "options.h" +#include "tools/qfvis/include/vis.h" +#include "tools/qfvis/include/options.h" #ifdef USE_PTHREADS pthread_attr_t threads_attrib; diff --git a/tools/qfvis/source/soundphs.c b/tools/qfvis/source/soundphs.c index 086e453cc..f21a9390d 100644 --- a/tools/qfvis/source/soundphs.c +++ b/tools/qfvis/source/soundphs.c @@ -54,7 +54,7 @@ #include "QF/quakefs.h" #include "QF/sys.h" -#include "vis.h" +#include "tools/qfvis/include/vis.h" /* Some textures (sky, water, slime, lava) are considered ambient sound diff --git a/tools/wad/Makefile.am b/tools/wad/Makefile.am deleted file mode 100644 index 7db82d273..000000000 --- a/tools/wad/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -WAD_LIBS=@WAD_LIBS@ -WAD_DEPS=@WAD_DEPS@ -WAD_INCS=@WAD_INCS@ - -AM_CPPFLAGS= -I$(top_srcdir)/include $(WAD_INCS) - - -bin_PROGRAMS= wad - -mans=wad.1 -man_MANS= $(mans) - -wad_SOURCES= grab.c script.c wad.c -wad_LDADD= $(WAD_LIBS) -wad_DEPENDENCIES= $(WAD_DEPS) - -EXTRA_DIST= wad.h $(mans) diff --git a/tools/wad/Makemodule.am b/tools/wad/Makemodule.am new file mode 100644 index 000000000..dd68d6842 --- /dev/null +++ b/tools/wad/Makemodule.am @@ -0,0 +1,13 @@ +WAD_LIBS=@WAD_LIBS@ +WAD_DEPS=@WAD_DEPS@ +WAD_INCS=@WAD_INCS@ + +bin_PROGRAMS += wad + +man_MANS += tools/wad/wad.1 + +wad_SOURCES= tools/wad/grab.c tools/wad/script.c tools/wad/wad.c +wad_LDADD= $(WAD_LIBS) +wad_DEPENDENCIES= $(WAD_DEPS) + +EXTRA_DIST += tools/wad/wad.h diff --git a/tools/wav/Makefile.am b/tools/wav/Makefile.am deleted file mode 100644 index 7e17fe376..000000000 --- a/tools/wav/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -AUTOMAKE_OPTIONS= foreign - -WAV_LIBS=@WAV_LIBS@ -WAV_DEPS=@WAV_DEPS@ -WAV_INCS=@WAV_INCS@ - -AM_CPPFLAGS= -I$(top_srcdir)/include $(WAV_INCS) - -bin_PROGRAMS= qfwavinfo - -mans=qfwavinfo.1 -man_MANS= #$(mans) - -qfwavinfo_SOURCES= qfwavinfo.c -qfwavinfo_LDADD= $(WAV_LIBS) -qfwavinfo_DEPENDENCIES= $(WAV_DEPS) - -EXTRA_DIST=#$(mans) diff --git a/tools/wav/Makemodule.am b/tools/wav/Makemodule.am new file mode 100644 index 000000000..4a4726809 --- /dev/null +++ b/tools/wav/Makemodule.am @@ -0,0 +1,11 @@ +WAV_LIBS=@WAV_LIBS@ +WAV_DEPS=@WAV_DEPS@ +WAV_INCS=@WAV_INCS@ + +bin_PROGRAMS += qfwavinfo + +#man_MANS += tools/wav/qfwavinfo.1 + +qfwavinfo_SOURCES= tools/wav/qfwavinfo.c +qfwavinfo_LDADD= $(WAV_LIBS) +qfwavinfo_DEPENDENCIES= $(WAV_DEPS) diff --git a/vc2005/Makefile.am b/vc2005/Makefile.am deleted file mode 100644 index 7f616ef19..000000000 --- a/vc2005/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign -EXTRA_DIST = \ - Makefile.am QuakeForge-VS8-Express.sln QuakeForge-VS8.sln \ - bsp2img/bsp2img.vcproj builtins/builtins.vcproj clean.ps1 \ - common/common.vcproj console/console.vcproj \ - console_client/console_client.vcproj console_server/console_server.vcproj \ - engine/engine.vcproj gib/gib.vcproj hw-master/hw-master.vcproj \ - image/image.vcproj include/config.h models-sw/models-sw.vcproj \ - models/models.vcproj modelsgl/modelsgl.vcproj net-main/net-main.vcproj \ - net/net.vcproj nq-common/nq-common.vcproj nq-sdl/nq-sdl.vcproj \ - nq-sdl32/nq-sdl32.vcproj nq-server/nq-server.vcproj nq-sgl/nq-sgl.vcproj \ - nq-wgl/nq-wgl.vcproj nq/nq.vcproj pak/pak.vcproj qfbsp/qfbsp.vcproj \ - qfcc/FlexBison.rules qfcc/qfcc.vcproj qfclient/qfclient.vcproj \ - qflight/qflight.vcproj qfmodelgen/qfmodelgen.vcproj \ - qfprogs/qfprogs.vcproj qfserver/qfserver.vcproj qfvis/qfvis.vcproj \ - qfwavinfo/qfwavinfo.vcproj qtv/qtv.vcproj \ - qw-client-sdl/qw-client-sdl.vcproj qw-client-sdl32/qw-client-sdl32.vcproj \ - qw-client-sgl/qw-client-sgl.vcproj qw-client-wgl/qw-client-wgl.vcproj \ - qw-master/qw-master.vcproj qw/qw.vcproj readme.txt ruamoko/ruamoko.vcproj \ - sound/sound.vcproj util/util.vcproj video-sdl/video-sdl.vcproj \ - video-sgl/video-sgl.vcproj video-sw/video-sw.vcproj \ - video-sw32/video-sw32.vcproj video-wgl/video-wgl.vcproj \ - video/video.vcproj videogl/videogl.vcproj wad/wad.vcproj diff --git a/vc2005/QuakeForge-VS8-Express.sln b/vc2005/QuakeForge-VS8-Express.sln deleted file mode 100644 index 404f35ff4..000000000 --- a/vc2005/QuakeForge-VS8-Express.sln +++ /dev/null @@ -1,935 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client", "qfclient\qfclient.vcproj", "{9A942925-61E6-4975-935A-5D62E8248E64}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw", "qw\qw.vcproj", "{6ADA4322-693A-46BB-897B-17BB5BE9F08C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-chan", "net\net.vcproj", "{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruamoko", "ruamoko\ruamoko.vcproj", "{51028ACF-53D4-4478-8500-55E6B8A81375}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-gl", "modelsgl\modelsgl.vcproj", "{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "console\console.vcproj", "{ED4AFBF5-C247-4352-966D-048B8998C6A1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gib", "gib\gib.vcproj", "{01C3B138-9D45-4ED6-A763-893C067262C2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util\util.vcproj", "{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcproj", "{2626C0E1-6F5C-47D3-B80D-93942D766DD7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "builtins", "builtins\builtins.vcproj", "{04FA9D77-E45F-4917-B972-B353BA6A6FA8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "sound\sound.vcproj", "{BF149D97-7520-4788-9CD1-3D99C5C8150F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "image\image.vcproj", "{5203F034-0047-4EC0-B7E9-D037FAF5D536}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video", "video\video.vcproj", "{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-common", "common\common.vcproj", "{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-server", "qfserver\qfserver.vcproj", "{544D097C-9C24-4C57-A171-8C8029421185}" - ProjectSection(ProjectDependencies) = postProject - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models", "models\models.vcproj", "{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-client", "console_client\console_client.vcproj", "{226D42CE-5833-444E-94FA-84C1D51892A8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-server", "console_server\console_server.vcproj", "{B37FE734-01F4-4799-86B2-D084820715BE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfbsp", "qfbsp\qfbsp.vcproj", "{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qflight", "qflight\qflight.vcproj", "{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfvis", "qfvis\qfvis.vcproj", "{E5D842C5-669F-4FC7-A5E0-44B562F86435}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-master", "qw-master\qw-master.vcproj", "{445A2500-3BBC-449A-A929-C419C2A16051}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfmodelgen", "qfmodelgen\qfmodelgen.vcproj", "{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfprogs", "qfprogs\qfprogs.vcproj", "{5FA27C8E-51B1-445A-A375-FBE74F0984B1}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfwavinfo", "qfwavinfo\qfwavinfo.vcproj", "{56BD559B-1590-4FC4-B441-AB1973BAC2BD}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wad", "wad\wad.vcproj", "{88422448-C5FB-46F3-A0B3-0811F90E537C}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pak", "pak\pak.vcproj", "{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsp2img", "bsp2img\bsp2img.vcproj", "{4605418D-2292-470A-AB18-C2119B016F71}" - ProjectSection(ProjectDependencies) = postProject - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtv", "qtv\qtv.vcproj", "{05E68E3B-5901-43A9-981D-CF392C0F5C6C}" - ProjectSection(ProjectDependencies) = postProject - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-common", "nq-common\nq-common.vcproj", "{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-wgl", "nq-wgl\nq-wgl.vcproj", "{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-main", "net-main\net-main.vcproj", "{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-server", "nq-server\nq-server.vcproj", "{231C032C-DE16-459A-8E7D-6509C2EC3998}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hw-master", "hw-master\hw-master.vcproj", "{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}" - ProjectSection(ProjectDependencies) = postProject - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfcc", "qfcc\qfcc.vcproj", "{40639893-4D75-48CD-811F-4B363CC71FFA}" - ProjectSection(ProjectDependencies) = postProject - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-wgl", "qw-client-wgl\qw-client-wgl.vcproj", "{5FD733BF-B3C6-4A96-BED7-35E2484448E1}" - ProjectSection(ProjectDependencies) = postProject - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sgl", "qw-client-sgl\qw-client-sgl.vcproj", "{649C4168-1C65-4E41-818F-85A1C52C1B8F}" - ProjectSection(ProjectDependencies) = postProject - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-gl", "videogl\videogl.vcproj", "{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sdl", "video-sdl\video-sdl.vcproj", "{44A18410-3AA8-4A64-935B-D20223AD6885}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl", "qw-client-sdl\qw-client-sdl.vcproj", "{B44CB3E0-F2FD-4260-A632-C01FB881613E}" - ProjectSection(ProjectDependencies) = postProject - {66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-sw", "models-sw\models-sw.vcproj", "{F4A9881E-0EB0-44A1-9664-B6CBDE992861}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw", "video-sw\video-sw.vcproj", "{66D3A191-E4D5-45F3-86BD-EFBB249CD554}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl32", "qw-client-sdl32\qw-client-sdl32.vcproj", "{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}" - ProjectSection(ProjectDependencies) = postProject - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw32", "video-sw32\video-sw32.vcproj", "{D5B9558F-EF25-4167-ACE4-723C7413B390}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq", "nq\nq.vcproj", "{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-wgl", "video-wgl\video-wgl.vcproj", "{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sgl", "video-sgl\video-sgl.vcproj", "{7E30C3B1-AEE7-483D-B231-C672365CD2D7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sgl", "nq-sgl\nq-sgl.vcproj", "{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl", "nq-sdl\nq-sdl.vcproj", "{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}" - ProjectSection(ProjectDependencies) = postProject - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl32", "nq-sdl32\nq-sdl32.vcproj", "{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}" - ProjectSection(ProjectDependencies) = postProject - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release (static)|Win32 = Release (static)|Win32 - Release (static)|x64 = Release (static)|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.ActiveCfg = Debug|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.Build.0 = Debug|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.ActiveCfg = Debug|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.Build.0 = Debug|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.Build.0 = Release (static)|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.ActiveCfg = Release|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.Build.0 = Release|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.ActiveCfg = Release|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.Build.0 = Release|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.ActiveCfg = Debug|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.Build.0 = Debug|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.ActiveCfg = Debug|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.Build.0 = Debug|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.Build.0 = Release (static)|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.ActiveCfg = Release|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.Build.0 = Release|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.ActiveCfg = Release|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.Build.0 = Release|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.ActiveCfg = Debug|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.Build.0 = Debug|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.ActiveCfg = Debug|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.Build.0 = Debug|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.Build.0 = Release (static)|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.ActiveCfg = Release|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.Build.0 = Release|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.ActiveCfg = Release|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.Build.0 = Release|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.ActiveCfg = Debug|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.Build.0 = Debug|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.ActiveCfg = Debug|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.Build.0 = Debug|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.Build.0 = Release (static)|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.ActiveCfg = Release|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.Build.0 = Release|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.ActiveCfg = Release|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.Build.0 = Release|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.Build.0 = Debug|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.ActiveCfg = Debug|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.Build.0 = Debug|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.Build.0 = Release (static)|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.ActiveCfg = Release|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.Build.0 = Release|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.ActiveCfg = Release|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.Build.0 = Release|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.ActiveCfg = Debug|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.Build.0 = Debug|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.ActiveCfg = Debug|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.Build.0 = Debug|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.Build.0 = Release (static)|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.ActiveCfg = Release|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.Build.0 = Release|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.ActiveCfg = Release|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.Build.0 = Release|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.ActiveCfg = Debug|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.Build.0 = Debug|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.ActiveCfg = Debug|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.Build.0 = Debug|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.Build.0 = Release (static)|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.ActiveCfg = Release|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.Build.0 = Release|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.ActiveCfg = Release|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.Build.0 = Release|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.ActiveCfg = Debug|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.Build.0 = Debug|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.ActiveCfg = Debug|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.Build.0 = Debug|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.Build.0 = Release (static)|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.ActiveCfg = Release|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.Build.0 = Release|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.ActiveCfg = Release|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.Build.0 = Release|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.ActiveCfg = Debug|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.Build.0 = Debug|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.ActiveCfg = Debug|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.Build.0 = Debug|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.Build.0 = Release (static)|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.ActiveCfg = Release|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.Build.0 = Release|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.ActiveCfg = Release|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.Build.0 = Release|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.ActiveCfg = Debug|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.Build.0 = Debug|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.ActiveCfg = Debug|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.Build.0 = Debug|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.Build.0 = Release (static)|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.ActiveCfg = Release|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.Build.0 = Release|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.ActiveCfg = Release|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.Build.0 = Release|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.ActiveCfg = Debug|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.Build.0 = Debug|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.ActiveCfg = Debug|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.Build.0 = Debug|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.Build.0 = Release (static)|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.ActiveCfg = Release|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.Build.0 = Release|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.ActiveCfg = Release|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.Build.0 = Release|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.ActiveCfg = Debug|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.Build.0 = Debug|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.ActiveCfg = Debug|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.Build.0 = Debug|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.Build.0 = Release (static)|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.ActiveCfg = Release|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.Build.0 = Release|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.ActiveCfg = Release|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.Build.0 = Release|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.ActiveCfg = Debug|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.Build.0 = Debug|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.ActiveCfg = Debug|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.Build.0 = Debug|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.Build.0 = Release (static)|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.ActiveCfg = Release|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.Build.0 = Release|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.ActiveCfg = Release|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.Build.0 = Release|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.ActiveCfg = Debug|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.Build.0 = Debug|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.ActiveCfg = Debug|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.Build.0 = Debug|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.Build.0 = Release (static)|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.ActiveCfg = Release|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.Build.0 = Release|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.ActiveCfg = Release|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.Build.0 = Release|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.ActiveCfg = Debug|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.Build.0 = Debug|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.ActiveCfg = Debug|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.Build.0 = Debug|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.Build.0 = Release (static)|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.ActiveCfg = Release|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.Build.0 = Release|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.ActiveCfg = Release|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.Build.0 = Release|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.Build.0 = Debug|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.ActiveCfg = Debug|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.Build.0 = Debug|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.Build.0 = Release (static)|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.ActiveCfg = Release|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.Build.0 = Release|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.ActiveCfg = Release|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.Build.0 = Release|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.Build.0 = Debug|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.ActiveCfg = Debug|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.Build.0 = Debug|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.Build.0 = Release (static)|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.ActiveCfg = Release|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.Build.0 = Release|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.ActiveCfg = Release|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.Build.0 = Release|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.Build.0 = Debug|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.ActiveCfg = Debug|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.Build.0 = Debug|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.Build.0 = Release (static)|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.ActiveCfg = Release|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.Build.0 = Release|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.ActiveCfg = Release|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.Build.0 = Release|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.ActiveCfg = Debug|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.Build.0 = Debug|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.ActiveCfg = Debug|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.Build.0 = Debug|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.Build.0 = Release (static)|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.ActiveCfg = Release|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.Build.0 = Release|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.ActiveCfg = Release|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.Build.0 = Release|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.Build.0 = Debug|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.ActiveCfg = Debug|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.Build.0 = Debug|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.Build.0 = Release (static)|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.ActiveCfg = Release|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.Build.0 = Release|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.ActiveCfg = Release|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.Build.0 = Release|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.ActiveCfg = Debug|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.Build.0 = Debug|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.ActiveCfg = Debug|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.Build.0 = Debug|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.Build.0 = Release (static)|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.ActiveCfg = Release|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.Build.0 = Release|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.ActiveCfg = Release|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.Build.0 = Release|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.ActiveCfg = Debug|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.Build.0 = Debug|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.ActiveCfg = Debug|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.Build.0 = Debug|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.Build.0 = Release (static)|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.ActiveCfg = Release|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.Build.0 = Release|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.ActiveCfg = Release|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.Build.0 = Release|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.ActiveCfg = Debug|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.Build.0 = Debug|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.ActiveCfg = Debug|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.Build.0 = Debug|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.Build.0 = Release (static)|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.ActiveCfg = Release|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.Build.0 = Release|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.ActiveCfg = Release|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.Build.0 = Release|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.Build.0 = Debug|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.ActiveCfg = Debug|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.Build.0 = Debug|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.Build.0 = Release (static)|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.ActiveCfg = Release|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.Build.0 = Release|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.ActiveCfg = Release|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.Build.0 = Release|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.ActiveCfg = Debug|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.Build.0 = Debug|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.ActiveCfg = Debug|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.Build.0 = Debug|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.Build.0 = Release (static)|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.ActiveCfg = Release|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.Build.0 = Release|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.ActiveCfg = Release|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.Build.0 = Release|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.ActiveCfg = Debug|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.Build.0 = Debug|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.ActiveCfg = Debug|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.Build.0 = Debug|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.Build.0 = Release (static)|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.ActiveCfg = Release|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.Build.0 = Release|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.ActiveCfg = Release|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.Build.0 = Release|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.ActiveCfg = Debug|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.Build.0 = Debug|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.ActiveCfg = Debug|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.Build.0 = Debug|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.Build.0 = Release (static)|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.ActiveCfg = Release|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.Build.0 = Release|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.ActiveCfg = Release|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.Build.0 = Release|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.ActiveCfg = Debug|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.Build.0 = Debug|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.ActiveCfg = Debug|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.Build.0 = Debug|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.Build.0 = Release (static)|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.ActiveCfg = Release|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.Build.0 = Release|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.ActiveCfg = Release|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.Build.0 = Release|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.ActiveCfg = Debug|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.Build.0 = Debug|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.ActiveCfg = Debug|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.Build.0 = Debug|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.Build.0 = Release (static)|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.ActiveCfg = Release|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.Build.0 = Release|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.ActiveCfg = Release|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.Build.0 = Release|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.ActiveCfg = Debug|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.Build.0 = Debug|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.ActiveCfg = Debug|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.Build.0 = Debug|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.Build.0 = Release (static)|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.ActiveCfg = Release|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.Build.0 = Release|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.ActiveCfg = Release|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.Build.0 = Release|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.ActiveCfg = Debug|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.Build.0 = Debug|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.ActiveCfg = Debug|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.Build.0 = Debug|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.Build.0 = Release (static)|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.ActiveCfg = Release|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.Build.0 = Release|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.ActiveCfg = Release|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.Build.0 = Release|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.ActiveCfg = Debug|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.Build.0 = Debug|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.ActiveCfg = Debug|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.Build.0 = Debug|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.Build.0 = Release (static)|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.ActiveCfg = Release|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.Build.0 = Release|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.ActiveCfg = Release|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.Build.0 = Release|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.ActiveCfg = Debug|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.Build.0 = Debug|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.ActiveCfg = Debug|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.Build.0 = Debug|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.Build.0 = Release (static)|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.ActiveCfg = Release|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.Build.0 = Release|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.ActiveCfg = Release|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.Build.0 = Release|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.ActiveCfg = Debug|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.Build.0 = Debug|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.ActiveCfg = Debug|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.Build.0 = Debug|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.Build.0 = Release (static)|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.ActiveCfg = Release|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.Build.0 = Release|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.ActiveCfg = Release|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.Build.0 = Release|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.ActiveCfg = Debug|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.Build.0 = Debug|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.ActiveCfg = Debug|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.Build.0 = Debug|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.Build.0 = Release (static)|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.ActiveCfg = Release|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.Build.0 = Release|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.ActiveCfg = Release|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.Build.0 = Release|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.Build.0 = Debug|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|x64.ActiveCfg = Debug|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.Build.0 = Release (static)|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.ActiveCfg = Release|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.Build.0 = Release|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.ActiveCfg = Release|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.Build.0 = Release|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.ActiveCfg = Debug|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.Build.0 = Debug|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|x64.ActiveCfg = Debug|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.Build.0 = Release (static)|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.ActiveCfg = Release|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.Build.0 = Release|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.ActiveCfg = Release|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.Build.0 = Release|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.ActiveCfg = Debug|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.Build.0 = Debug|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|x64.ActiveCfg = Debug|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.Build.0 = Release (static)|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.ActiveCfg = Release|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.Build.0 = Release|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.ActiveCfg = Release|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.Build.0 = Release|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.ActiveCfg = Debug|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.Build.0 = Debug|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|x64.ActiveCfg = Debug|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.Build.0 = Release (static)|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.ActiveCfg = Release|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.Build.0 = Release|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.ActiveCfg = Release|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.Build.0 = Release|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.ActiveCfg = Debug|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.Build.0 = Debug|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|x64.ActiveCfg = Debug|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.Build.0 = Release (static)|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.ActiveCfg = Release|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.Build.0 = Release|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.ActiveCfg = Release|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.Build.0 = Release|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.ActiveCfg = Debug|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.Build.0 = Debug|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|x64.ActiveCfg = Debug|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.Build.0 = Release (static)|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.ActiveCfg = Release|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.Build.0 = Release|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.ActiveCfg = Release|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.Build.0 = Release|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.ActiveCfg = Debug|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.Build.0 = Debug|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|x64.ActiveCfg = Debug|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.Build.0 = Release (static)|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.ActiveCfg = Release|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.Build.0 = Release|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.ActiveCfg = Release|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.Build.0 = Release|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.ActiveCfg = Debug|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.Build.0 = Debug|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|x64.ActiveCfg = Debug|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.Build.0 = Release (static)|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.ActiveCfg = Release|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.Build.0 = Release|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.ActiveCfg = Release|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.Build.0 = Release|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.ActiveCfg = Debug|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.Build.0 = Debug|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|x64.ActiveCfg = Debug|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.Build.0 = Release (static)|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.ActiveCfg = Release|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.Build.0 = Release|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.ActiveCfg = Release|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.Build.0 = Release|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.ActiveCfg = Debug|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.Build.0 = Debug|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|x64.ActiveCfg = Debug|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.Build.0 = Release (static)|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.ActiveCfg = Release|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.Build.0 = Release|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.ActiveCfg = Release|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.Build.0 = Release|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.ActiveCfg = Debug|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.Build.0 = Debug|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|x64.ActiveCfg = Debug|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.Build.0 = Release (static)|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.ActiveCfg = Release|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.Build.0 = Release|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.ActiveCfg = Release|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.Build.0 = Release|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.Build.0 = Debug|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|x64.ActiveCfg = Debug|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.Build.0 = Release (static)|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.ActiveCfg = Release|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.Build.0 = Release|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.ActiveCfg = Release|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.Build.0 = Release|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.ActiveCfg = Debug|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.Build.0 = Debug|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|x64.ActiveCfg = Debug|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.Build.0 = Release (static)|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.ActiveCfg = Release|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.Build.0 = Release|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.ActiveCfg = Release|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.Build.0 = Release|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.ActiveCfg = Debug|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.Build.0 = Debug|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|x64.ActiveCfg = Debug|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.Build.0 = Release (static)|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.ActiveCfg = Release|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.Build.0 = Release|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.ActiveCfg = Release|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.Build.0 = Release|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.Build.0 = Debug|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|x64.ActiveCfg = Debug|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.Build.0 = Release (static)|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.ActiveCfg = Release|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.Build.0 = Release|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.ActiveCfg = Release|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/vc2005/QuakeForge-VS8.sln b/vc2005/QuakeForge-VS8.sln deleted file mode 100644 index de80d166d..000000000 --- a/vc2005/QuakeForge-VS8.sln +++ /dev/null @@ -1,966 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client", "qfclient\qfclient.vcproj", "{9A942925-61E6-4975-935A-5D62E8248E64}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw", "qw\qw.vcproj", "{6ADA4322-693A-46BB-897B-17BB5BE9F08C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-chan", "net\net.vcproj", "{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruamoko", "ruamoko\ruamoko.vcproj", "{51028ACF-53D4-4478-8500-55E6B8A81375}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-gl", "modelsgl\modelsgl.vcproj", "{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "console\console.vcproj", "{ED4AFBF5-C247-4352-966D-048B8998C6A1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gib", "gib\gib.vcproj", "{01C3B138-9D45-4ED6-A763-893C067262C2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util\util.vcproj", "{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcproj", "{2626C0E1-6F5C-47D3-B80D-93942D766DD7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "builtins", "builtins\builtins.vcproj", "{04FA9D77-E45F-4917-B972-B353BA6A6FA8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "sound\sound.vcproj", "{BF149D97-7520-4788-9CD1-3D99C5C8150F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "image\image.vcproj", "{5203F034-0047-4EC0-B7E9-D037FAF5D536}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video", "video\video.vcproj", "{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-common", "common\common.vcproj", "{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-server", "qfserver\qfserver.vcproj", "{544D097C-9C24-4C57-A171-8C8029421185}" - ProjectSection(ProjectDependencies) = postProject - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models", "models\models.vcproj", "{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-client", "console_client\console_client.vcproj", "{226D42CE-5833-444E-94FA-84C1D51892A8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-server", "console_server\console_server.vcproj", "{B37FE734-01F4-4799-86B2-D084820715BE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfbsp", "qfbsp\qfbsp.vcproj", "{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qflight", "qflight\qflight.vcproj", "{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfvis", "qfvis\qfvis.vcproj", "{E5D842C5-669F-4FC7-A5E0-44B562F86435}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-master", "qw-master\qw-master.vcproj", "{445A2500-3BBC-449A-A929-C419C2A16051}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfmodelgen", "qfmodelgen\qfmodelgen.vcproj", "{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfprogs", "qfprogs\qfprogs.vcproj", "{5FA27C8E-51B1-445A-A375-FBE74F0984B1}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfwavinfo", "qfwavinfo\qfwavinfo.vcproj", "{56BD559B-1590-4FC4-B441-AB1973BAC2BD}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wad", "wad\wad.vcproj", "{88422448-C5FB-46F3-A0B3-0811F90E537C}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pak", "pak\pak.vcproj", "{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsp2img", "bsp2img\bsp2img.vcproj", "{4605418D-2292-470A-AB18-C2119B016F71}" - ProjectSection(ProjectDependencies) = postProject - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtv", "qtv\qtv.vcproj", "{05E68E3B-5901-43A9-981D-CF392C0F5C6C}" - ProjectSection(ProjectDependencies) = postProject - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-common", "nq-common\nq-common.vcproj", "{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-wgl", "nq-wgl\nq-wgl.vcproj", "{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-main", "net-main\net-main.vcproj", "{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-server", "nq-server\nq-server.vcproj", "{231C032C-DE16-459A-8E7D-6509C2EC3998}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hw-master", "hw-master\hw-master.vcproj", "{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}" - ProjectSection(ProjectDependencies) = postProject - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{3CDA2798-7565-47C5-B972-F9E63DBEFFFA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfcc", "qfcc\qfcc.vcproj", "{40639893-4D75-48CD-811F-4B363CC71FFA}" - ProjectSection(ProjectDependencies) = postProject - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-wgl", "qw-client-wgl\qw-client-wgl.vcproj", "{5FD733BF-B3C6-4A96-BED7-35E2484448E1}" - ProjectSection(ProjectDependencies) = postProject - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sgl", "qw-client-sgl\qw-client-sgl.vcproj", "{649C4168-1C65-4E41-818F-85A1C52C1B8F}" - ProjectSection(ProjectDependencies) = postProject - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-gl", "videogl\videogl.vcproj", "{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sdl", "video-sdl\video-sdl.vcproj", "{44A18410-3AA8-4A64-935B-D20223AD6885}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl", "qw-client-sdl\qw-client-sdl.vcproj", "{B44CB3E0-F2FD-4260-A632-C01FB881613E}" - ProjectSection(ProjectDependencies) = postProject - {66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-sw", "models-sw\models-sw.vcproj", "{F4A9881E-0EB0-44A1-9664-B6CBDE992861}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw", "video-sw\video-sw.vcproj", "{66D3A191-E4D5-45F3-86BD-EFBB249CD554}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl32", "qw-client-sdl32\qw-client-sdl32.vcproj", "{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}" - ProjectSection(ProjectDependencies) = postProject - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw32", "video-sw32\video-sw32.vcproj", "{D5B9558F-EF25-4167-ACE4-723C7413B390}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq", "nq\nq.vcproj", "{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-wgl", "video-wgl\video-wgl.vcproj", "{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sgl", "video-sgl\video-sgl.vcproj", "{7E30C3B1-AEE7-483D-B231-C672365CD2D7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sgl", "nq-sgl\nq-sgl.vcproj", "{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl", "nq-sdl\nq-sdl.vcproj", "{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}" - ProjectSection(ProjectDependencies) = postProject - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl32", "nq-sdl32\nq-sdl32.vcproj", "{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}" - ProjectSection(ProjectDependencies) = postProject - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release (static)|Win32 = Release (static)|Win32 - Release (static)|x64 = Release (static)|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.ActiveCfg = Debug|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.Build.0 = Debug|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.ActiveCfg = Debug|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.Build.0 = Debug|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.Build.0 = Release (static)|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.ActiveCfg = Release|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.Build.0 = Release|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.ActiveCfg = Release|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.Build.0 = Release|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.ActiveCfg = Debug|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.Build.0 = Debug|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.ActiveCfg = Debug|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.Build.0 = Debug|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.Build.0 = Release (static)|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.ActiveCfg = Release|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.Build.0 = Release|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.ActiveCfg = Release|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.Build.0 = Release|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.ActiveCfg = Debug|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.Build.0 = Debug|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.ActiveCfg = Debug|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.Build.0 = Debug|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.Build.0 = Release (static)|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.ActiveCfg = Release|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.Build.0 = Release|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.ActiveCfg = Release|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.Build.0 = Release|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.ActiveCfg = Debug|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.Build.0 = Debug|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.ActiveCfg = Debug|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.Build.0 = Debug|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.Build.0 = Release (static)|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.ActiveCfg = Release|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.Build.0 = Release|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.ActiveCfg = Release|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.Build.0 = Release|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.Build.0 = Debug|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.ActiveCfg = Debug|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.Build.0 = Debug|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.Build.0 = Release (static)|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.ActiveCfg = Release|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.Build.0 = Release|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.ActiveCfg = Release|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.Build.0 = Release|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.ActiveCfg = Debug|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.Build.0 = Debug|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.ActiveCfg = Debug|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.Build.0 = Debug|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.Build.0 = Release (static)|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.ActiveCfg = Release|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.Build.0 = Release|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.ActiveCfg = Release|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.Build.0 = Release|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.ActiveCfg = Debug|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.Build.0 = Debug|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.ActiveCfg = Debug|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.Build.0 = Debug|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.Build.0 = Release (static)|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.ActiveCfg = Release|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.Build.0 = Release|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.ActiveCfg = Release|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.Build.0 = Release|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.ActiveCfg = Debug|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.Build.0 = Debug|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.ActiveCfg = Debug|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.Build.0 = Debug|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.Build.0 = Release (static)|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.ActiveCfg = Release|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.Build.0 = Release|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.ActiveCfg = Release|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.Build.0 = Release|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.ActiveCfg = Debug|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.Build.0 = Debug|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.ActiveCfg = Debug|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.Build.0 = Debug|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.Build.0 = Release (static)|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.ActiveCfg = Release|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.Build.0 = Release|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.ActiveCfg = Release|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.Build.0 = Release|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.ActiveCfg = Debug|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.Build.0 = Debug|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.ActiveCfg = Debug|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.Build.0 = Debug|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.Build.0 = Release (static)|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.ActiveCfg = Release|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.Build.0 = Release|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.ActiveCfg = Release|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.Build.0 = Release|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.ActiveCfg = Debug|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.Build.0 = Debug|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.ActiveCfg = Debug|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.Build.0 = Debug|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.Build.0 = Release (static)|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.ActiveCfg = Release|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.Build.0 = Release|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.ActiveCfg = Release|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.Build.0 = Release|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.ActiveCfg = Debug|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.Build.0 = Debug|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.ActiveCfg = Debug|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.Build.0 = Debug|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.Build.0 = Release (static)|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.ActiveCfg = Release|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.Build.0 = Release|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.ActiveCfg = Release|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.Build.0 = Release|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.ActiveCfg = Debug|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.Build.0 = Debug|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.ActiveCfg = Debug|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.Build.0 = Debug|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.Build.0 = Release (static)|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.ActiveCfg = Release|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.Build.0 = Release|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.ActiveCfg = Release|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.Build.0 = Release|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.ActiveCfg = Debug|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.Build.0 = Debug|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.ActiveCfg = Debug|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.Build.0 = Debug|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.Build.0 = Release (static)|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.ActiveCfg = Release|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.Build.0 = Release|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.ActiveCfg = Release|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.Build.0 = Release|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.ActiveCfg = Debug|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.Build.0 = Debug|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.ActiveCfg = Debug|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.Build.0 = Debug|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.Build.0 = Release (static)|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.ActiveCfg = Release|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.Build.0 = Release|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.ActiveCfg = Release|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.Build.0 = Release|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.Build.0 = Debug|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.ActiveCfg = Debug|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.Build.0 = Debug|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.Build.0 = Release (static)|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.ActiveCfg = Release|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.Build.0 = Release|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.ActiveCfg = Release|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.Build.0 = Release|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.Build.0 = Debug|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.ActiveCfg = Debug|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.Build.0 = Debug|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.Build.0 = Release (static)|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.ActiveCfg = Release|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.Build.0 = Release|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.ActiveCfg = Release|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.Build.0 = Release|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.Build.0 = Debug|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.ActiveCfg = Debug|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.Build.0 = Debug|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.Build.0 = Release (static)|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.ActiveCfg = Release|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.Build.0 = Release|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.ActiveCfg = Release|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.Build.0 = Release|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.ActiveCfg = Debug|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.Build.0 = Debug|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.ActiveCfg = Debug|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.Build.0 = Debug|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.Build.0 = Release (static)|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.ActiveCfg = Release|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.Build.0 = Release|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.ActiveCfg = Release|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.Build.0 = Release|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.Build.0 = Debug|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.ActiveCfg = Debug|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.Build.0 = Debug|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.Build.0 = Release (static)|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.ActiveCfg = Release|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.Build.0 = Release|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.ActiveCfg = Release|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.Build.0 = Release|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.ActiveCfg = Debug|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.Build.0 = Debug|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.ActiveCfg = Debug|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.Build.0 = Debug|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.Build.0 = Release (static)|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.ActiveCfg = Release|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.Build.0 = Release|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.ActiveCfg = Release|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.Build.0 = Release|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.ActiveCfg = Debug|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.Build.0 = Debug|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.ActiveCfg = Debug|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.Build.0 = Debug|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.Build.0 = Release (static)|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.ActiveCfg = Release|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.Build.0 = Release|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.ActiveCfg = Release|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.Build.0 = Release|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.ActiveCfg = Debug|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.Build.0 = Debug|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.ActiveCfg = Debug|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.Build.0 = Debug|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.Build.0 = Release (static)|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.ActiveCfg = Release|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.Build.0 = Release|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.ActiveCfg = Release|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.Build.0 = Release|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.Build.0 = Debug|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.ActiveCfg = Debug|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.Build.0 = Debug|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.Build.0 = Release (static)|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.ActiveCfg = Release|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.Build.0 = Release|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.ActiveCfg = Release|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.Build.0 = Release|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.ActiveCfg = Debug|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.Build.0 = Debug|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.ActiveCfg = Debug|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.Build.0 = Debug|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.Build.0 = Release (static)|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.ActiveCfg = Release|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.Build.0 = Release|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.ActiveCfg = Release|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.Build.0 = Release|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.ActiveCfg = Debug|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.Build.0 = Debug|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.ActiveCfg = Debug|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.Build.0 = Debug|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.Build.0 = Release (static)|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.ActiveCfg = Release|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.Build.0 = Release|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.ActiveCfg = Release|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.Build.0 = Release|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.ActiveCfg = Debug|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.Build.0 = Debug|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.ActiveCfg = Debug|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.Build.0 = Debug|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.Build.0 = Release (static)|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.ActiveCfg = Release|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.Build.0 = Release|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.ActiveCfg = Release|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.Build.0 = Release|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.ActiveCfg = Debug|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.Build.0 = Debug|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.ActiveCfg = Debug|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.Build.0 = Debug|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.Build.0 = Release (static)|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.ActiveCfg = Release|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.Build.0 = Release|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.ActiveCfg = Release|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.Build.0 = Release|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.ActiveCfg = Debug|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.Build.0 = Debug|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.ActiveCfg = Debug|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.Build.0 = Debug|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.Build.0 = Release (static)|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.ActiveCfg = Release|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.Build.0 = Release|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.ActiveCfg = Release|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.Build.0 = Release|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.ActiveCfg = Debug|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.Build.0 = Debug|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.ActiveCfg = Debug|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.Build.0 = Debug|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.Build.0 = Release (static)|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.ActiveCfg = Release|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.Build.0 = Release|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.ActiveCfg = Release|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.Build.0 = Release|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.ActiveCfg = Debug|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.Build.0 = Debug|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.ActiveCfg = Debug|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.Build.0 = Debug|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.Build.0 = Release (static)|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.ActiveCfg = Release|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.Build.0 = Release|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.ActiveCfg = Release|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.Build.0 = Release|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.ActiveCfg = Debug|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.Build.0 = Debug|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.ActiveCfg = Debug|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.Build.0 = Debug|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.Build.0 = Release (static)|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.ActiveCfg = Release|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.Build.0 = Release|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.ActiveCfg = Release|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.Build.0 = Release|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.ActiveCfg = Debug|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.Build.0 = Debug|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.ActiveCfg = Debug|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.Build.0 = Debug|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.Build.0 = Release (static)|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.ActiveCfg = Release|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.Build.0 = Release|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.ActiveCfg = Release|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.Build.0 = Release|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.ActiveCfg = Debug|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.Build.0 = Debug|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.ActiveCfg = Debug|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.Build.0 = Debug|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.Build.0 = Release (static)|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.ActiveCfg = Release|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.Build.0 = Release|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.ActiveCfg = Release|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.Build.0 = Release|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.ActiveCfg = Debug|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.Build.0 = Debug|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.ActiveCfg = Debug|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.Build.0 = Debug|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.Build.0 = Release (static)|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.ActiveCfg = Release|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.Build.0 = Release|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.ActiveCfg = Release|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.Build.0 = Release|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.Build.0 = Debug|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|x64.ActiveCfg = Debug|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.Build.0 = Release (static)|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.ActiveCfg = Release|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.Build.0 = Release|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.ActiveCfg = Release|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.Build.0 = Release|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.ActiveCfg = Debug|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.Build.0 = Debug|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|x64.ActiveCfg = Debug|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.Build.0 = Release (static)|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.ActiveCfg = Release|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.Build.0 = Release|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.ActiveCfg = Release|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.Build.0 = Release|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.ActiveCfg = Debug|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.Build.0 = Debug|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|x64.ActiveCfg = Debug|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.Build.0 = Release (static)|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.ActiveCfg = Release|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.Build.0 = Release|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.ActiveCfg = Release|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.Build.0 = Release|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.ActiveCfg = Debug|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.Build.0 = Debug|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|x64.ActiveCfg = Debug|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.Build.0 = Release (static)|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.ActiveCfg = Release|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.Build.0 = Release|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.ActiveCfg = Release|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.Build.0 = Release|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.ActiveCfg = Debug|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.Build.0 = Debug|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|x64.ActiveCfg = Debug|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.Build.0 = Release (static)|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.ActiveCfg = Release|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.Build.0 = Release|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.ActiveCfg = Release|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.Build.0 = Release|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.ActiveCfg = Debug|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.Build.0 = Debug|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|x64.ActiveCfg = Debug|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.Build.0 = Release (static)|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.ActiveCfg = Release|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.Build.0 = Release|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.ActiveCfg = Release|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.Build.0 = Release|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.ActiveCfg = Debug|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.Build.0 = Debug|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|x64.ActiveCfg = Debug|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.Build.0 = Release (static)|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.ActiveCfg = Release|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.Build.0 = Release|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.ActiveCfg = Release|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.Build.0 = Release|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.ActiveCfg = Debug|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.Build.0 = Debug|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|x64.ActiveCfg = Debug|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.Build.0 = Release (static)|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.ActiveCfg = Release|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.Build.0 = Release|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.ActiveCfg = Release|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.Build.0 = Release|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.ActiveCfg = Debug|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.Build.0 = Debug|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|x64.ActiveCfg = Debug|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.Build.0 = Release (static)|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.ActiveCfg = Release|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.Build.0 = Release|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.ActiveCfg = Release|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.Build.0 = Release|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.ActiveCfg = Debug|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.Build.0 = Debug|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|x64.ActiveCfg = Debug|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.Build.0 = Release (static)|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.ActiveCfg = Release|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.Build.0 = Release|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.ActiveCfg = Release|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.Build.0 = Release|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.ActiveCfg = Debug|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.Build.0 = Debug|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|x64.ActiveCfg = Debug|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.Build.0 = Release (static)|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.ActiveCfg = Release|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.Build.0 = Release|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.ActiveCfg = Release|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.Build.0 = Release|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.Build.0 = Debug|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|x64.ActiveCfg = Debug|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.Build.0 = Release (static)|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.ActiveCfg = Release|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.Build.0 = Release|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.ActiveCfg = Release|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.Build.0 = Release|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.ActiveCfg = Debug|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.Build.0 = Debug|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|x64.ActiveCfg = Debug|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.Build.0 = Release (static)|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.ActiveCfg = Release|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.Build.0 = Release|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.ActiveCfg = Release|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.Build.0 = Release|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.ActiveCfg = Debug|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.Build.0 = Debug|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|x64.ActiveCfg = Debug|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.Build.0 = Release (static)|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.ActiveCfg = Release|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.Build.0 = Release|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.ActiveCfg = Release|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.Build.0 = Release|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.Build.0 = Debug|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|x64.ActiveCfg = Debug|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.Build.0 = Release (static)|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.ActiveCfg = Release|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.Build.0 = Release|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.ActiveCfg = Release|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {B37FE734-01F4-4799-86B2-D084820715BE} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {9A942925-61E6-4975-935A-5D62E8248E64} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {D5B9558F-EF25-4167-ACE4-723C7413B390} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - EndGlobalSection -EndGlobal diff --git a/vc2005/bsp2img/bsp2img.vcproj b/vc2005/bsp2img/bsp2img.vcproj deleted file mode 100644 index 49beb4a45..000000000 --- a/vc2005/bsp2img/bsp2img.vcproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/builtins/builtins.vcproj b/vc2005/builtins/builtins.vcproj deleted file mode 100644 index 63e384c61..000000000 --- a/vc2005/builtins/builtins.vcproj +++ /dev/null @@ -1,473 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/clean.ps1 b/vc2005/clean.ps1 deleted file mode 100644 index b1e75f990..000000000 --- a/vc2005/clean.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -ls -recurse -include 'win32','x64','*.user' | rm -recurse -if(test-path QuakeForge.suo) { rm QuakeForge.suo -force } -if(test-path QuakeForge.ncb) { rm QuakeForge.ncb } \ No newline at end of file diff --git a/vc2005/common/common.vcproj b/vc2005/common/common.vcproj deleted file mode 100644 index e473c7cce..000000000 --- a/vc2005/common/common.vcproj +++ /dev/null @@ -1,489 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/console/console.vcproj b/vc2005/console/console.vcproj deleted file mode 100644 index b71cf236e..000000000 --- a/vc2005/console/console.vcproj +++ /dev/null @@ -1,493 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/console_client/console_client.vcproj b/vc2005/console_client/console_client.vcproj deleted file mode 100644 index b6ae66820..000000000 --- a/vc2005/console_client/console_client.vcproj +++ /dev/null @@ -1,481 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/console_server/console_server.vcproj b/vc2005/console_server/console_server.vcproj deleted file mode 100644 index 4c3347b3a..000000000 --- a/vc2005/console_server/console_server.vcproj +++ /dev/null @@ -1,469 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/engine/engine.vcproj b/vc2005/engine/engine.vcproj deleted file mode 100644 index f3b7665ff..000000000 --- a/vc2005/engine/engine.vcproj +++ /dev/null @@ -1,509 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/gib/gib.vcproj b/vc2005/gib/gib.vcproj deleted file mode 100644 index 4039956cb..000000000 --- a/vc2005/gib/gib.vcproj +++ /dev/null @@ -1,537 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/hw-master/hw-master.vcproj b/vc2005/hw-master/hw-master.vcproj deleted file mode 100644 index 133d54777..000000000 --- a/vc2005/hw-master/hw-master.vcproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/image/image.vcproj b/vc2005/image/image.vcproj deleted file mode 100644 index e32ffd958..000000000 --- a/vc2005/image/image.vcproj +++ /dev/null @@ -1,481 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/include/config.h b/vc2005/include/config.h deleted file mode 100644 index 1b787db16..000000000 --- a/vc2005/include/config.h +++ /dev/null @@ -1,740 +0,0 @@ -/* include/config.h. Generated from config.h.in by configure. */ -/* include/config.h.in. Generated from configure.ac by autoheader. */ - -/* list of cd plugins */ -#define CD_PLUGIN_LIST {"cd_win", cd_win_PluginInfo},{0, 0} - -/* list of cd prototypes */ -#define CD_PLUGIN_PROTOS extern plugin_t *cd_win_PluginInfo (void); - -/* list of client plugins */ -#define CLIENT_PLUGIN_LIST {"console_client", console_client_PluginInfo},{0, 0} - -/* list of client prototypes */ -#define CLIENT_PLUGIN_PROTOS extern plugin_t *console_client_PluginInfo (void); - -/* Define this to the command line for the C preprocessor */ -#define CPP_NAME "wave --c99 %d -o %o %i" - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define this to the location of the global config file */ -#define FS_GLOBALCFG "~/quakeforge.conf" - -/* Define this to the path from which to load plugins */ -#define FS_PLUGINPATH "/usr/local/lib/quakeforge" - -/* Define this to the shared game directory root */ -#define FS_SHAREPATH "." - -/* Define this to the location of the user config file */ -#define FS_USERCFG "~/quakeforgerc" - -/* Define this to the unshared game directory root */ -#define FS_USERPATH "." - -/* Define this to the default GL dynamic lib */ -#define GL_DRIVER "OPENGL32.DLL" - -/* Define to 1 if you have the `access' function. */ -#define HAVE_ACCESS 1 - -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define this if alloca is prototyped */ -/* #undef HAVE_ALLOCA_PROTO */ -#ifndef HAVE_ALLOCA_PROTO -#ifndef QFASM -void *alloca (int size); -#endif -#endif - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ALSA_ASOUNDLIB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ARPA_INET_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ASM_IO_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_ASSERT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_CONIO_H 1 - -/* Define to 1 if you have the `connect' function. */ -#define HAVE_CONNECT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_CTYPE_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_CURSES_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DDRAW_H 1 - -/* Define if you have the XFree86 DGA extension */ -/* #undef HAVE_DGA */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DINPUT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DIRECT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define if you have the dlopen function. */ -/* #undef HAVE_DLOPEN */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DMEDIA_AUDIO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DMEDIA_CDAUDIO_H */ - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DPMI_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DSOUND_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_EXECINFO_H */ - -/* Define this if you have FB_AUX_VGA_PLANES_CFB4 */ -/* #undef HAVE_FB_AUX_VGA_PLANES_CFB4 */ - -/* Define this if you have FB_AUX_VGA_PLANES_CFB4 */ -/* #undef HAVE_FB_AUX_VGA_PLANES_CFB8 */ - -/* Define this if you have FB_AUX_VGA_PLANES_VGA4 */ -/* #undef HAVE_FB_AUX_VGA_PLANES_VGA4 */ - -/* Define to 1 if you have the `fcntl' function. */ -/* #undef HAVE_FCNTL */ - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* define this if you have flac libs */ -/* #undef HAVE_FLAC */ - -/* Define to 1 if you have the header file. */ -#define HAVE_FNMATCH_H 1 - -/* Define this if fnmatch is prototyped in fnmatch.h */ -/* #undef HAVE_FNMATCH_PROTO */ - -/* Define this if FPOS_T is a struct */ -/* #undef HAVE_FPOS_T_STRUCT */ - -/* Define to 1 if you have the `ftime' function. */ -#define HAVE_FTIME 1 - -/* Define to 1 if you have the `getaddrinfo' function. */ -#define HAVE_GETADDRINFO 1 - -/* Define to 1 if you have the `gethostbyname' function. */ -#define HAVE_GETHOSTBYNAME 1 - -/* Define to 1 if you have the `gethostname' function. */ -#define HAVE_GETHOSTNAME 1 - -/* Define to 1 if you have the `getnameinfo' function. */ -#define HAVE_GETNAMEINFO 1 - -/* Define to 1 if you have the `getpagesize' function. */ -/* #undef HAVE_GETPAGESIZE */ - -/* Define to 1 if you have the `gettimeofday' function. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define to 1 if you have the `getwd' function. */ -/* #undef HAVE_GETWD */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* Define this if your system has struct in_pktinfo */ -/* #undef HAVE_IN_PKTINFO */ - -/* Define to 1 if you have the header file. */ -#define HAVE_IO_H 1 - -/* Define this if you want IPv6 support */ -/* #undef HAVE_IPV6 */ - -/* Define if you have libjack */ -/* #undef HAVE_JACK */ - -/* Define to 1 if you have a functional curl library. */ -#define HAVE_LIBCURL 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LIBC_H */ - -/* Define to 1 if you have the `db' library (-ldb). */ -/* #undef HAVE_LIBDB */ - -/* Define to 1 if you have the `efence' library (-lefence). */ -/* #undef HAVE_LIBEFENCE */ - -/* Define to 1 if you have the `m' library (-lm). */ -/* #undef HAVE_LIBM */ - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_CDROM_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_FB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_JOYSTICK_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_SOUNDCARD_H */ - -/* Define to 1 if you support file names longer than 14 characters. */ -#define HAVE_LONG_FILE_NAMES 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MACHINE_SOUNDCARD_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MALLOC_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MATH_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MGRAPH_H */ - -/* Define to 1 if you have the `mkdir' function. */ -#define HAVE_MKDIR 1 - -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `mprotect' function. */ -/* #undef HAVE_MPROTECT */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_NETDB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_NETINET_IN_H */ - -/* Define if you have libpng */ -/* #undef HAVE_PNG */ - -/* Define to 1 if you have the header file. */ -#define HAVE_PROCESS_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_PTHREAD_H */ - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_PWD_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_RPC_TYPES_H */ - -/* Define this if you have sa_len member in struct sockaddr (BSD) */ -/* #undef HAVE_SA_LEN */ - -/* Define to 1 if you have the `select' function. */ -#define HAVE_SELECT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SETJMP_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SIGNAL_H 1 - -/* Define this if you have sin6_len member in struct sockaddr_in6 (BSD) */ -/* #undef HAVE_SIN6_LEN */ - -/* Define this if your system has size_t */ -#define HAVE_SIZE_T 1 - -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if you have the `socket' function. */ -#define HAVE_SOCKET 1 - -/* Define this if your system has socklen_t */ -/* #undef HAVE_SOCKLEN_T */ - -/* Define this if you have ss_len member in struct sockaddr_storage (BSD) */ -/* #undef HAVE_SS_LEN */ - -/* Define to 1 if you have the `stat' function. */ -#define HAVE_STAT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDARG_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDIO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasestr' function. */ -/* #undef HAVE_STRCASESTR */ - -/* Define this if strcasestr is prototyped in string.h */ -/* #undef HAVE_STRCASESTR_PROTO */ - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STRINGS_H 1 */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strnlen' function. */ -#define HAVE_STRNLEN 1 - -/* Define this if strnlen is prototyped in string.h */ -#define HAVE_STRNLEN_PROTO 1 - -/* Define to 1 if you have the `strsep' function. */ -/* #undef HAVE_STRSEP */ - -/* Define to 1 if you have the `strstr' function. */ -#define HAVE_STRSTR 1 - -/* Define to 1 if `st_blksize' is member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */ - -/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ -/* #undef HAVE_ST_BLKSIZE */ - -/* Define this if C symbols are prefixed with an underscore */ -#define HAVE_SYM_PREFIX_UNDERSCORE 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_ASOUNDLIB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_AUDIOIO_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_FILIO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IOCTL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IPC_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_PARAM_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_POLL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SHM_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SIGNAL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SOCKET_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SOUNDCARD_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIME_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_UIO_H */ - -/* Define to 1 if you have that is POSIX.1 compatible. */ -/* #undef HAVE_SYS_WAIT_H */ - -/* Define this if you have tchar.h */ -#define HAVE_TCHAR_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_TERMIOS_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_TIME_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_UNISTD_H */ - -/* Define to 1 if you have the `usleep' function. */ -/* #undef HAVE_USLEEP */ - -/* Define if va_copy is available */ -/* #undef HAVE_VA_COPY */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_VGAKEYBOARD_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_VGAMOUSE_H */ - -/* Define if you have the XFree86 VIDMODE extension */ -/* #undef HAVE_VIDMODE */ - -/* define this if you have ogg/vorbis libs */ -/* #undef HAVE_VORBIS */ - -/* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - -/* Define if you have WildMidi */ -/* #undef HAVE_WILDMIDI */ - -/* Define to 1 if you have the header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_WINSOCK_H 1 - -/* Define if you have XMMS */ -/* #undef HAVE_XMMS */ - -/* Define if you have zlib */ -#define HAVE_ZLIB 1 - -/* Define to 1 if you have the `_access' function. */ -#define HAVE__ACCESS 1 - -/* Define to 1 if you have the `_ftime' function. */ -#define HAVE__FTIME 1 - -/* Define to 1 if you have the <_mingw.h> header file. */ -/* #undef HAVE__MINGW_H */ - -/* Define to 1 if you have the `_mkdir' function. */ -#define HAVE__MKDIR 1 - -/* Define this if you have _SC_PAGESIZE */ -/* #undef HAVE__SC_PAGESIZE */ - -/* Define to 1 if you have the `_snprintf' function. */ -#define HAVE__SNPRINTF 1 - -/* Define if __va_copy is available */ -/* #undef HAVE__VA_COPY */ - -/* Define to 1 if you have the `_vsnprintf' function. */ -#define HAVE__VSNPRINTF 1 - -/* Define this if the GCC __attribute__ keyword is available */ -/* #undef HAVE___ATTRIBUTE__ */ - -#ifndef HAVE___ATTRIBUTE__ -# define __attribute__(x) -#endif - -/* Define this if the GCC __attribute__ keyword is available */ -/* #undef HAVE___ATTRIBUTE__VISIBILITY */ - -#ifdef HAVE___ATTRIBUTE__VISIBILITY -# define VISIBLE __attribute__((visibility ("default"))) -#else -# define VISIBLE -#endif - -/* Define this if the GCC __builtin_expect keyword is available */ -/* #undef HAVE___BUILTIN_EXPECT */ - -#ifndef HAVE___BUILTIN_EXPECT -# define __builtin_expect(x,c) x -#endif - -/* Defined if libcurl supports AsynchDNS */ -/* #undef LIBCURL_FEATURE_ASYNCHDNS */ - -/* Defined if libcurl supports IDN */ -#define LIBCURL_FEATURE_IDN 1 - -/* Defined if libcurl supports IPv6 */ -#define LIBCURL_FEATURE_IPV6 1 - -/* Defined if libcurl supports KRB4 */ -/* #undef LIBCURL_FEATURE_KRB4 */ - -/* Defined if libcurl supports libz */ -#define LIBCURL_FEATURE_LIBZ 1 - -/* Defined if libcurl supports NTLM */ -#define LIBCURL_FEATURE_NTLM 1 - -/* Defined if libcurl supports SSL */ -/* #undef LIBCURL_FEATURE_SSL */ - -/* Defined if libcurl supports SSPI */ -#define LIBCURL_FEATURE_SSPI 1 - -/* Defined if libcurl supports DICT */ -/* #undef LIBCURL_PROTOCOL_DICT */ - -/* Defined if libcurl supports FILE */ -/* #undef LIBCURL_PROTOCOL_FILE */ - -/* Defined if libcurl supports FTP */ -#define LIBCURL_PROTOCOL_FTP 1 - -/* Defined if libcurl supports FTPS */ -/* #undef LIBCURL_PROTOCOL_FTPS */ - -/* Defined if libcurl supports HTTP */ -#define LIBCURL_PROTOCOL_HTTP 1 - -/* Defined if libcurl supports HTTPS */ -/* #undef LIBCURL_PROTOCOL_HTTPS */ - -/* Defined if libcurl supports LDAP */ -/* #undef LIBCURL_PROTOCOL_LDAP */ - -/* Defined if libcurl supports TELNET */ -/* #undef LIBCURL_PROTOCOL_TELNET */ - -/* Defined if libcurl supports TFTP */ -/* #undef LIBCURL_PROTOCOL_TFTP */ - -/* Define to 1 if `major', `minor', and `makedev' are declared in . - */ -/* #undef MAJOR_IN_MKDEV */ - -/* Define to 1 if `major', `minor', and `makedev' are declared in - . */ -/* #undef MAJOR_IN_SYSMACROS */ - -/* Define this to the QSG standard version you support in NetQuake */ -#define NQ_QSG_VERSION "1.0" - -/* Define this to the NetQuake standard version you support */ -#define NQ_VERSION "1.09" - -/* Name of package */ -#define PACKAGE "quakeforge" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* Define this to your operating system's path separator character */ -#define PATH_SEPARATOR '/' - -/* "Proper" package name */ -#define PROGRAM "QuakeForge" - -/* Define this to where qfcc should look for header files */ -#define QFCC_INCLUDE_PATH "/usr/local/include/QF/ruamoko" - -/* Define this to where qfcc should look for lib files */ -#define QFCC_LIB_PATH "/usr/local/lib/ruamoko" - -/* Define this to the QSG standard version you support in QuakeWorld */ -#define QW_QSG_VERSION "2.0" - -/* Define this to the QuakeWorld standard version you support */ -#define QW_VERSION "2.40" - -/* Define as the return type of signal handlers (`int' or `void'). */ -#define RETSIGTYPE void - -/* list of server plugins */ -#define SERVER_PLUGIN_LIST {"console_server", console_server_PluginInfo},{0, 0} - -/* list of server prototypes */ -#define SERVER_PLUGIN_PROTOS extern plugin_t *console_server_PluginInfo (void); - -/* Define this to the default sound output driver. */ -#define SND_OUTPUT_DEFAULT "win" - -/* list of sound output plugins */ -#define SND_OUTPUT_LIST {"snd_output_win", snd_output_win_PluginInfo},{0, 0} - -/* list of sound output prototypes */ -#define SND_OUTPUT_PROTOS extern plugin_t *snd_output_win_PluginInfo (void); - -/* list of sound render plugins */ -#define SND_RENDER_LIST {"snd_render_default", snd_render_default_PluginInfo},{0, 0} - -/* list of sound render prototypes */ -#define SND_RENDER_PROTOS extern plugin_t *snd_render_default_PluginInfo (void); - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ - -/* Define this if you are building static plugins */ -#define STATIC_PLUGINS 1 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Define to 1 if your declares `struct tm'. */ -/* #undef TM_IN_SYS_TIME */ - -/* Define this if you want progs typechecking */ -/* #undef TYPECHECK_PROGS */ - -/* Define this if you want to use Intel assembly optimizations */ -/* #undef USE_INTEL_ASM */ - -/* Define if va_list is an array */ -/* #undef VA_LIST_IS_ARRAY */ - -/* Version number of package */ -#define VERSION "0.5.5-SVN" - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - -/* Define to 1 if the X Window System is missing or not being used. */ -/* #undef X_DISPLAY_MISSING */ - -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ -/* #undef YYTEXT_POINTER */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define curl_free() as free() if our version of curl lacks curl_free. */ -/* #undef curl_free */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#define inline __inline -/* #undef inline */ -#endif - -/* Define to `unsigned int' if does not define. */ -/* #undef size_t */ - -/* Define strcasecmp as stricmp if you have one but not the other */ -#define strcasecmp stricmp - -/* new stuff, for VC2005 compatibility (phrosty) */ - -#define _CRT_SECURE_NO_WARNINGS -#define _CRT_NONSTDC_NO_WARNINGS - -/* used in qfcc. should #define to _ReturnAddress()? */ -#define __builtin_return_address(x) (0) - -#define _WIN32_WINNT 0x0500 -#define DIRECTINPUT_VERSION 0x0600 - -#define INITGUID - -#define snprintf _snprintf -#define strncasecmp strnicmp - -#define ssize_t ptrdiff_t -#define S_ISDIR(mode) (mode & _S_IFDIR) - -/* used in access() */ -#define R_OK 04 - -/* - disable silent conversion warnings for fixing later.. - - 4047: 'operator' : 'identifier1' differs in levels of indirection from 'identifier2' - 4244: 'argument' : conversion from 'type1' to 'type2', possible loss of data - 4267: 'var' : conversion from 'size_t' to 'type', possible loss of data (/Wp64 warning) - 4305: 'identifier' : truncation from 'type1' to 'type2' - 4311: 'variable' : pointer truncation from 'type' to 'type' (/Wp64 warning) - 4312: 'operation' : conversion from 'type1' to 'type2' of greater size (/Wp64 warning) -*/ -#pragma warning(disable:4047 4244 4267 4305 4311 4312) diff --git a/vc2005/models-sw/models-sw.vcproj b/vc2005/models-sw/models-sw.vcproj deleted file mode 100644 index 6eb490b83..000000000 --- a/vc2005/models-sw/models-sw.vcproj +++ /dev/null @@ -1,511 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/models/models.vcproj b/vc2005/models/models.vcproj deleted file mode 100644 index 06c14ed04..000000000 --- a/vc2005/models/models.vcproj +++ /dev/null @@ -1,489 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/modelsgl/modelsgl.vcproj b/vc2005/modelsgl/modelsgl.vcproj deleted file mode 100644 index 4f455edbe..000000000 --- a/vc2005/modelsgl/modelsgl.vcproj +++ /dev/null @@ -1,521 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/net-main/net-main.vcproj b/vc2005/net-main/net-main.vcproj deleted file mode 100644 index d986b743a..000000000 --- a/vc2005/net-main/net-main.vcproj +++ /dev/null @@ -1,487 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/net/net.vcproj b/vc2005/net/net.vcproj deleted file mode 100644 index 5b43da9e5..000000000 --- a/vc2005/net/net.vcproj +++ /dev/null @@ -1,473 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/nq-common/nq-common.vcproj b/vc2005/nq-common/nq-common.vcproj deleted file mode 100644 index 0dccdd9a4..000000000 --- a/vc2005/nq-common/nq-common.vcproj +++ /dev/null @@ -1,515 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/nq-sdl/nq-sdl.vcproj b/vc2005/nq-sdl/nq-sdl.vcproj deleted file mode 100644 index f4813f262..000000000 --- a/vc2005/nq-sdl/nq-sdl.vcproj +++ /dev/null @@ -1,561 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/nq-sdl32/nq-sdl32.vcproj b/vc2005/nq-sdl32/nq-sdl32.vcproj deleted file mode 100644 index 9c46d06f4..000000000 --- a/vc2005/nq-sdl32/nq-sdl32.vcproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/nq-server/nq-server.vcproj b/vc2005/nq-server/nq-server.vcproj deleted file mode 100644 index 2b89d7bbe..000000000 --- a/vc2005/nq-server/nq-server.vcproj +++ /dev/null @@ -1,571 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/nq-sgl/nq-sgl.vcproj b/vc2005/nq-sgl/nq-sgl.vcproj deleted file mode 100644 index 3e61b1f10..000000000 --- a/vc2005/nq-sgl/nq-sgl.vcproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/nq-wgl/nq-wgl.vcproj b/vc2005/nq-wgl/nq-wgl.vcproj deleted file mode 100644 index a789c0871..000000000 --- a/vc2005/nq-wgl/nq-wgl.vcproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/nq/nq.vcproj b/vc2005/nq/nq.vcproj deleted file mode 100644 index 82cf3e55f..000000000 --- a/vc2005/nq/nq.vcproj +++ /dev/null @@ -1,543 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/pak/pak.vcproj b/vc2005/pak/pak.vcproj deleted file mode 100644 index 0daa6d627..000000000 --- a/vc2005/pak/pak.vcproj +++ /dev/null @@ -1,571 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qfbsp/qfbsp.vcproj b/vc2005/qfbsp/qfbsp.vcproj deleted file mode 100644 index 461d6734b..000000000 --- a/vc2005/qfbsp/qfbsp.vcproj +++ /dev/null @@ -1,637 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qfcc/FlexBison.rules b/vc2005/qfcc/FlexBison.rules deleted file mode 100644 index 0e4c1e3dc..000000000 --- a/vc2005/qfcc/FlexBison.rules +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qfcc/qfcc.vcproj b/vc2005/qfcc/qfcc.vcproj deleted file mode 100644 index 786974fe1..000000000 --- a/vc2005/qfcc/qfcc.vcproj +++ /dev/null @@ -1,970 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qfclient/qfclient.vcproj b/vc2005/qfclient/qfclient.vcproj deleted file mode 100644 index 19d1fac4d..000000000 --- a/vc2005/qfclient/qfclient.vcproj +++ /dev/null @@ -1,625 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qflight/qflight.vcproj b/vc2005/qflight/qflight.vcproj deleted file mode 100644 index 820cbc14a..000000000 --- a/vc2005/qflight/qflight.vcproj +++ /dev/null @@ -1,625 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qfmodelgen/qfmodelgen.vcproj b/vc2005/qfmodelgen/qfmodelgen.vcproj deleted file mode 100644 index 24436bea5..000000000 --- a/vc2005/qfmodelgen/qfmodelgen.vcproj +++ /dev/null @@ -1,583 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qfprogs/qfprogs.vcproj b/vc2005/qfprogs/qfprogs.vcproj deleted file mode 100644 index d77e43a2e..000000000 --- a/vc2005/qfprogs/qfprogs.vcproj +++ /dev/null @@ -1,595 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qfserver/qfserver.vcproj b/vc2005/qfserver/qfserver.vcproj deleted file mode 100644 index 2852ccec3..000000000 --- a/vc2005/qfserver/qfserver.vcproj +++ /dev/null @@ -1,677 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qfvis/qfvis.vcproj b/vc2005/qfvis/qfvis.vcproj deleted file mode 100644 index 4e34daab8..000000000 --- a/vc2005/qfvis/qfvis.vcproj +++ /dev/null @@ -1,593 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qfwavinfo/qfwavinfo.vcproj b/vc2005/qfwavinfo/qfwavinfo.vcproj deleted file mode 100644 index 9e2ead0d5..000000000 --- a/vc2005/qfwavinfo/qfwavinfo.vcproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qtv/qtv.vcproj b/vc2005/qtv/qtv.vcproj deleted file mode 100644 index 127035507..000000000 --- a/vc2005/qtv/qtv.vcproj +++ /dev/null @@ -1,599 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qw-client-sdl/qw-client-sdl.vcproj b/vc2005/qw-client-sdl/qw-client-sdl.vcproj deleted file mode 100644 index 188d11f88..000000000 --- a/vc2005/qw-client-sdl/qw-client-sdl.vcproj +++ /dev/null @@ -1,563 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qw-client-sdl32/qw-client-sdl32.vcproj b/vc2005/qw-client-sdl32/qw-client-sdl32.vcproj deleted file mode 100644 index ccbdb9c89..000000000 --- a/vc2005/qw-client-sdl32/qw-client-sdl32.vcproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qw-client-sgl/qw-client-sgl.vcproj b/vc2005/qw-client-sgl/qw-client-sgl.vcproj deleted file mode 100644 index 22adf9217..000000000 --- a/vc2005/qw-client-sgl/qw-client-sgl.vcproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qw-client-wgl/qw-client-wgl.vcproj b/vc2005/qw-client-wgl/qw-client-wgl.vcproj deleted file mode 100644 index 96fb8c16a..000000000 --- a/vc2005/qw-client-wgl/qw-client-wgl.vcproj +++ /dev/null @@ -1,563 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qw-master/qw-master.vcproj b/vc2005/qw-master/qw-master.vcproj deleted file mode 100644 index a8605e358..000000000 --- a/vc2005/qw-master/qw-master.vcproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/qw/qw.vcproj b/vc2005/qw/qw.vcproj deleted file mode 100644 index d73566194..000000000 --- a/vc2005/qw/qw.vcproj +++ /dev/null @@ -1,473 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/readme.txt b/vc2005/readme.txt deleted file mode 100644 index 8c50717db..000000000 --- a/vc2005/readme.txt +++ /dev/null @@ -1,27 +0,0 @@ -Requirements -============= -- Visual C++ 2005 SP1 -- Windows Vista SDK (previous RC compilers won't recognize the - high-resolution Vista icon) -- DirectX SDK (for DirectInput) -- SDL (required for sdl, sdl32, and sgl builds) -- bison/flex (required for qfcc, needs to be in your compiler path) - -Optional -========= -- zlib (#undef HAVE_ZLIB from vc2005/include/config.h if you don't want - this). Expects zlib.lib and zlib.dll for Debug/Release builds, and - libzlib.lib for Release (static) build. -- libcurl (#undef HAVE_LIBCURL from vc2005/include/config.h if you don't - want this). Expects curl.lib and curl.dll for Debug/Release builds, - and libcurl.lib for Release (static) build. - -Notes -====== -By default, qfcc is configured to use the Boost Wave preprocessor. You -can get this from http://www.boost.org, or change the CPP_NAME #define in -vc2005/include/config.h to whatever preprocessor you want. If you have -GCC, you can simply replace "wave --c99" with "gcc" in the define and it -should work. - -clean.ps1 is a Windows Powershell script that cleans up any build files. diff --git a/vc2005/ruamoko/ruamoko.vcproj b/vc2005/ruamoko/ruamoko.vcproj deleted file mode 100644 index 93fd48673..000000000 --- a/vc2005/ruamoko/ruamoko.vcproj +++ /dev/null @@ -1,517 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/sound/sound.vcproj b/vc2005/sound/sound.vcproj deleted file mode 100644 index 50c25ce4c..000000000 --- a/vc2005/sound/sound.vcproj +++ /dev/null @@ -1,513 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/util/util.vcproj b/vc2005/util/util.vcproj deleted file mode 100644 index 021e3d655..000000000 --- a/vc2005/util/util.vcproj +++ /dev/null @@ -1,617 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/video-sdl/video-sdl.vcproj b/vc2005/video-sdl/video-sdl.vcproj deleted file mode 100644 index 5efd89c56..000000000 --- a/vc2005/video-sdl/video-sdl.vcproj +++ /dev/null @@ -1,471 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/video-sgl/video-sgl.vcproj b/vc2005/video-sgl/video-sgl.vcproj deleted file mode 100644 index 94be99a3a..000000000 --- a/vc2005/video-sgl/video-sgl.vcproj +++ /dev/null @@ -1,467 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/video-sw/video-sw.vcproj b/vc2005/video-sw/video-sw.vcproj deleted file mode 100644 index 9158369bf..000000000 --- a/vc2005/video-sw/video-sw.vcproj +++ /dev/null @@ -1,595 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/video-sw32/video-sw32.vcproj b/vc2005/video-sw32/video-sw32.vcproj deleted file mode 100644 index fd4ed7caa..000000000 --- a/vc2005/video-sw32/video-sw32.vcproj +++ /dev/null @@ -1,571 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/video-wgl/video-wgl.vcproj b/vc2005/video-wgl/video-wgl.vcproj deleted file mode 100644 index 0087c8b78..000000000 --- a/vc2005/video-wgl/video-wgl.vcproj +++ /dev/null @@ -1,471 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/video/video.vcproj b/vc2005/video/video.vcproj deleted file mode 100644 index 44213b2a4..000000000 --- a/vc2005/video/video.vcproj +++ /dev/null @@ -1,537 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/videogl/videogl.vcproj b/vc2005/videogl/videogl.vcproj deleted file mode 100644 index cfd456dc5..000000000 --- a/vc2005/videogl/videogl.vcproj +++ /dev/null @@ -1,555 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2005/wad/wad.vcproj b/vc2005/wad/wad.vcproj deleted file mode 100644 index 044bff20a..000000000 --- a/vc2005/wad/wad.vcproj +++ /dev/null @@ -1,579 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/Makefile.am b/vc2008/Makefile.am deleted file mode 100644 index 04c53f194..000000000 --- a/vc2008/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS= foreign -EXTRA_DIST = \ - Makefile.am QuakeForge.sln bsp2img/bsp2img.vcproj \ - builtins/builtins.vcproj clean.ps1 common/common.vcproj \ - console/console.vcproj console_client/console_client.vcproj \ - console_server/console_server.vcproj engine/engine.vcproj gib/gib.vcproj \ - hw-master/hw-master.vcproj image/image.vcproj include/config.h \ - models-sw/models-sw.vcproj models/models.vcproj modelsgl/modelsgl.vcproj \ - net-main/net-main.vcproj net/net.vcproj nq-common/nq-common.vcproj \ - nq-sdl/nq-sdl.vcproj nq-sdl32/nq-sdl32.vcproj nq-server/nq-server.vcproj \ - nq-sgl/nq-sgl.vcproj nq-wgl/nq-wgl.vcproj nq/nq.vcproj pak/pak.vcproj \ - qfbsp/qfbsp.vcproj qfcc/FlexBison.rules qfcc/qfcc.vcproj \ - qfclient/qfclient.vcproj qflight/qflight.vcproj \ - qfmodelgen/qfmodelgen.vcproj qfprogs/qfprogs.vcproj \ - qfserver/qfserver.vcproj qfvis/qfvis.vcproj qfwavinfo/qfwavinfo.vcproj \ - qtv/qtv.vcproj qw-client-sdl/qw-client-sdl.vcproj \ - qw-client-sdl32/qw-client-sdl32.vcproj qw-client-sgl/qw-client-sgl.vcproj \ - qw-client-wgl/qw-client-wgl.vcproj qw-master/qw-master.vcproj \ - qw/qw.vcproj readme.txt ruamoko/ruamoko.vcproj sound/sound.vcproj \ - util/util.vcproj video-sdl/video-sdl.vcproj video-sgl/video-sgl.vcproj \ - video-sw/video-sw.vcproj video-sw32/video-sw32.vcproj \ - video-wgl/video-wgl.vcproj video/video.vcproj videogl/videogl.vcproj \ - wad/wad.vcproj diff --git a/vc2008/QuakeForge.sln b/vc2008/QuakeForge.sln deleted file mode 100644 index 296484c89..000000000 --- a/vc2008/QuakeForge.sln +++ /dev/null @@ -1,966 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{3CDA2798-7565-47C5-B972-F9E63DBEFFFA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client", "qfclient\qfclient.vcproj", "{9A942925-61E6-4975-935A-5D62E8248E64}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw", "qw\qw.vcproj", "{6ADA4322-693A-46BB-897B-17BB5BE9F08C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-chan", "net\net.vcproj", "{6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruamoko", "ruamoko\ruamoko.vcproj", "{51028ACF-53D4-4478-8500-55E6B8A81375}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-gl", "modelsgl\modelsgl.vcproj", "{1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "console\console.vcproj", "{ED4AFBF5-C247-4352-966D-048B8998C6A1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gib", "gib\gib.vcproj", "{01C3B138-9D45-4ED6-A763-893C067262C2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util\util.vcproj", "{ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcproj", "{2626C0E1-6F5C-47D3-B80D-93942D766DD7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "builtins", "builtins\builtins.vcproj", "{04FA9D77-E45F-4917-B972-B353BA6A6FA8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "sound\sound.vcproj", "{BF149D97-7520-4788-9CD1-3D99C5C8150F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "image\image.vcproj", "{5203F034-0047-4EC0-B7E9-D037FAF5D536}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video", "video\video.vcproj", "{E7B3D07D-2FE8-481B-8DAB-6255A412A42F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-common", "common\common.vcproj", "{BC1F021A-1EEC-4A7A-B746-5AA6048E478C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-server", "qfserver\qfserver.vcproj", "{544D097C-9C24-4C57-A171-8C8029421185}" - ProjectSection(ProjectDependencies) = postProject - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models", "models\models.vcproj", "{DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-client", "console_client\console_client.vcproj", "{226D42CE-5833-444E-94FA-84C1D51892A8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console-server", "console_server\console_server.vcproj", "{B37FE734-01F4-4799-86B2-D084820715BE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfbsp", "qfbsp\qfbsp.vcproj", "{B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qflight", "qflight\qflight.vcproj", "{5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfvis", "qfvis\qfvis.vcproj", "{E5D842C5-669F-4FC7-A5E0-44B562F86435}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-master", "qw-master\qw-master.vcproj", "{445A2500-3BBC-449A-A929-C419C2A16051}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfmodelgen", "qfmodelgen\qfmodelgen.vcproj", "{052C34FE-C9E2-43ED-95DA-FB3F27B44E37}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfprogs", "qfprogs\qfprogs.vcproj", "{5FA27C8E-51B1-445A-A375-FBE74F0984B1}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfwavinfo", "qfwavinfo\qfwavinfo.vcproj", "{56BD559B-1590-4FC4-B441-AB1973BAC2BD}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wad", "wad\wad.vcproj", "{88422448-C5FB-46F3-A0B3-0811F90E537C}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pak", "pak\pak.vcproj", "{9EE8BD4B-47D3-4AD5-A8B9-831329792A05}" - ProjectSection(ProjectDependencies) = postProject - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bsp2img", "bsp2img\bsp2img.vcproj", "{4605418D-2292-470A-AB18-C2119B016F71}" - ProjectSection(ProjectDependencies) = postProject - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtv", "qtv\qtv.vcproj", "{05E68E3B-5901-43A9-981D-CF392C0F5C6C}" - ProjectSection(ProjectDependencies) = postProject - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-common", "nq-common\nq-common.vcproj", "{6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-wgl", "nq-wgl\nq-wgl.vcproj", "{1CD1A18B-95D5-4EA4-917C-34B10066BFCC}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net-main", "net-main\net-main.vcproj", "{053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-server", "nq-server\nq-server.vcproj", "{231C032C-DE16-459A-8E7D-6509C2EC3998}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hw-master", "hw-master\hw-master.vcproj", "{419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}" - ProjectSection(ProjectDependencies) = postProject - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qfcc", "qfcc\qfcc.vcproj", "{40639893-4D75-48CD-811F-4B363CC71FFA}" - ProjectSection(ProjectDependencies) = postProject - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-wgl", "qw-client-wgl\qw-client-wgl.vcproj", "{5FD733BF-B3C6-4A96-BED7-35E2484448E1}" - ProjectSection(ProjectDependencies) = postProject - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sgl", "qw-client-sgl\qw-client-sgl.vcproj", "{649C4168-1C65-4E41-818F-85A1C52C1B8F}" - ProjectSection(ProjectDependencies) = postProject - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-gl", "videogl\videogl.vcproj", "{C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sdl", "video-sdl\video-sdl.vcproj", "{44A18410-3AA8-4A64-935B-D20223AD6885}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl", "qw-client-sdl\qw-client-sdl.vcproj", "{B44CB3E0-F2FD-4260-A632-C01FB881613E}" - ProjectSection(ProjectDependencies) = postProject - {66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "models-sw", "models-sw\models-sw.vcproj", "{F4A9881E-0EB0-44A1-9664-B6CBDE992861}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw", "video-sw\video-sw.vcproj", "{66D3A191-E4D5-45F3-86BD-EFBB249CD554}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qw-client-sdl32", "qw-client-sdl32\qw-client-sdl32.vcproj", "{CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}" - ProjectSection(ProjectDependencies) = postProject - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {6ADA4322-693A-46BB-897B-17BB5BE9F08C} - {9A942925-61E6-4975-935A-5D62E8248E64} = {9A942925-61E6-4975-935A-5D62E8248E64} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sw32", "video-sw32\video-sw32.vcproj", "{D5B9558F-EF25-4167-ACE4-723C7413B390}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq", "nq\nq.vcproj", "{155112B9-A8A9-4E06-90F5-4AAAB32B2F70}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-wgl", "video-wgl\video-wgl.vcproj", "{178D81A7-F2FB-41D7-B300-9D1A4DE5E137}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "video-sgl", "video-sgl\video-sgl.vcproj", "{7E30C3B1-AEE7-483D-B231-C672365CD2D7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sgl", "nq-sgl\nq-sgl.vcproj", "{2E26DB8B-9E37-4072-B397-8A7086E0ACD0}" - ProjectSection(ProjectDependencies) = postProject - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {7E30C3B1-AEE7-483D-B231-C672365CD2D7} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl", "nq-sdl\nq-sdl.vcproj", "{2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}" - ProjectSection(ProjectDependencies) = postProject - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {66D3A191-E4D5-45F3-86BD-EFBB249CD554} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nq-sdl32", "nq-sdl32\nq-sdl32.vcproj", "{2CEB1965-A89C-4422-A9AC-B30FCE7913C3}" - ProjectSection(ProjectDependencies) = postProject - {44A18410-3AA8-4A64-935B-D20223AD6885} = {44A18410-3AA8-4A64-935B-D20223AD6885} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {F4A9881E-0EB0-44A1-9664-B6CBDE992861} - {B37FE734-01F4-4799-86B2-D084820715BE} = {B37FE734-01F4-4799-86B2-D084820715BE} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {5203F034-0047-4EC0-B7E9-D037FAF5D536} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {01C3B138-9D45-4ED6-A763-893C067262C2} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {04FA9D77-E45F-4917-B972-B353BA6A6FA8} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} - {D5B9558F-EF25-4167-ACE4-723C7413B390} = {D5B9558F-EF25-4167-ACE4-723C7413B390} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {BF149D97-7520-4788-9CD1-3D99C5C8150F} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {226D42CE-5833-444E-94FA-84C1D51892A8} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {51028ACF-53D4-4478-8500-55E6B8A81375} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {2626C0E1-6F5C-47D3-B80D-93942D766DD7} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {ED4AFBF5-C247-4352-966D-048B8998C6A1} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release (static)|Win32 = Release (static)|Win32 - Release (static)|x64 = Release (static)|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.ActiveCfg = Debug|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|Win32.Build.0 = Debug|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.ActiveCfg = Debug|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Debug|x64.Build.0 = Debug|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release (static)|x64.Build.0 = Release (static)|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.ActiveCfg = Release|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|Win32.Build.0 = Release|Win32 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.ActiveCfg = Release|x64 - {9A942925-61E6-4975-935A-5D62E8248E64}.Release|x64.Build.0 = Release|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.ActiveCfg = Debug|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|Win32.Build.0 = Debug|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.ActiveCfg = Debug|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Debug|x64.Build.0 = Debug|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release (static)|x64.Build.0 = Release (static)|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.ActiveCfg = Release|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|Win32.Build.0 = Release|Win32 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.ActiveCfg = Release|x64 - {6ADA4322-693A-46BB-897B-17BB5BE9F08C}.Release|x64.Build.0 = Release|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.ActiveCfg = Debug|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|Win32.Build.0 = Debug|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.ActiveCfg = Debug|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Debug|x64.Build.0 = Debug|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release (static)|x64.Build.0 = Release (static)|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.ActiveCfg = Release|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|Win32.Build.0 = Release|Win32 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.ActiveCfg = Release|x64 - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0}.Release|x64.Build.0 = Release|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.ActiveCfg = Debug|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|Win32.Build.0 = Debug|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.ActiveCfg = Debug|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Debug|x64.Build.0 = Debug|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release (static)|x64.Build.0 = Release (static)|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.ActiveCfg = Release|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|Win32.Build.0 = Release|Win32 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.ActiveCfg = Release|x64 - {51028ACF-53D4-4478-8500-55E6B8A81375}.Release|x64.Build.0 = Release|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|Win32.Build.0 = Debug|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.ActiveCfg = Debug|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Debug|x64.Build.0 = Debug|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release (static)|x64.Build.0 = Release (static)|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.ActiveCfg = Release|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|Win32.Build.0 = Release|Win32 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.ActiveCfg = Release|x64 - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7}.Release|x64.Build.0 = Release|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.ActiveCfg = Debug|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|Win32.Build.0 = Debug|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.ActiveCfg = Debug|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Debug|x64.Build.0 = Debug|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release (static)|x64.Build.0 = Release (static)|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.ActiveCfg = Release|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|Win32.Build.0 = Release|Win32 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.ActiveCfg = Release|x64 - {ED4AFBF5-C247-4352-966D-048B8998C6A1}.Release|x64.Build.0 = Release|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.ActiveCfg = Debug|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|Win32.Build.0 = Debug|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.ActiveCfg = Debug|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Debug|x64.Build.0 = Debug|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release (static)|x64.Build.0 = Release (static)|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.ActiveCfg = Release|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|Win32.Build.0 = Release|Win32 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.ActiveCfg = Release|x64 - {01C3B138-9D45-4ED6-A763-893C067262C2}.Release|x64.Build.0 = Release|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.ActiveCfg = Debug|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|Win32.Build.0 = Debug|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.ActiveCfg = Debug|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Debug|x64.Build.0 = Debug|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release (static)|x64.Build.0 = Release (static)|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.ActiveCfg = Release|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|Win32.Build.0 = Release|Win32 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.ActiveCfg = Release|x64 - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB}.Release|x64.Build.0 = Release|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.ActiveCfg = Debug|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|Win32.Build.0 = Debug|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.ActiveCfg = Debug|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Debug|x64.Build.0 = Debug|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release (static)|x64.Build.0 = Release (static)|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.ActiveCfg = Release|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|Win32.Build.0 = Release|Win32 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.ActiveCfg = Release|x64 - {2626C0E1-6F5C-47D3-B80D-93942D766DD7}.Release|x64.Build.0 = Release|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.ActiveCfg = Debug|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|Win32.Build.0 = Debug|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.ActiveCfg = Debug|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Debug|x64.Build.0 = Debug|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release (static)|x64.Build.0 = Release (static)|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.ActiveCfg = Release|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|Win32.Build.0 = Release|Win32 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.ActiveCfg = Release|x64 - {04FA9D77-E45F-4917-B972-B353BA6A6FA8}.Release|x64.Build.0 = Release|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.ActiveCfg = Debug|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|Win32.Build.0 = Debug|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.ActiveCfg = Debug|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Debug|x64.Build.0 = Debug|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release (static)|x64.Build.0 = Release (static)|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.ActiveCfg = Release|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|Win32.Build.0 = Release|Win32 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.ActiveCfg = Release|x64 - {BF149D97-7520-4788-9CD1-3D99C5C8150F}.Release|x64.Build.0 = Release|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.ActiveCfg = Debug|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|Win32.Build.0 = Debug|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.ActiveCfg = Debug|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Debug|x64.Build.0 = Debug|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release (static)|x64.Build.0 = Release (static)|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.ActiveCfg = Release|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|Win32.Build.0 = Release|Win32 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.ActiveCfg = Release|x64 - {5203F034-0047-4EC0-B7E9-D037FAF5D536}.Release|x64.Build.0 = Release|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.ActiveCfg = Debug|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|Win32.Build.0 = Debug|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.ActiveCfg = Debug|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Debug|x64.Build.0 = Debug|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release (static)|x64.Build.0 = Release (static)|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.ActiveCfg = Release|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|Win32.Build.0 = Release|Win32 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.ActiveCfg = Release|x64 - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F}.Release|x64.Build.0 = Release|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.ActiveCfg = Debug|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|Win32.Build.0 = Debug|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.ActiveCfg = Debug|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Debug|x64.Build.0 = Debug|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release (static)|x64.Build.0 = Release (static)|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.ActiveCfg = Release|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|Win32.Build.0 = Release|Win32 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.ActiveCfg = Release|x64 - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C}.Release|x64.Build.0 = Release|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.ActiveCfg = Debug|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|Win32.Build.0 = Debug|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.ActiveCfg = Debug|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Debug|x64.Build.0 = Debug|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release (static)|x64.Build.0 = Release (static)|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.ActiveCfg = Release|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|Win32.Build.0 = Release|Win32 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.ActiveCfg = Release|x64 - {544D097C-9C24-4C57-A171-8C8029421185}.Release|x64.Build.0 = Release|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|Win32.Build.0 = Debug|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.ActiveCfg = Debug|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Debug|x64.Build.0 = Debug|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release (static)|x64.Build.0 = Release (static)|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.ActiveCfg = Release|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|Win32.Build.0 = Release|Win32 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.ActiveCfg = Release|x64 - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A}.Release|x64.Build.0 = Release|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|Win32.Build.0 = Debug|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.ActiveCfg = Debug|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Debug|x64.Build.0 = Debug|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release (static)|x64.Build.0 = Release (static)|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.ActiveCfg = Release|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|Win32.Build.0 = Release|Win32 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.ActiveCfg = Release|x64 - {226D42CE-5833-444E-94FA-84C1D51892A8}.Release|x64.Build.0 = Release|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|Win32.Build.0 = Debug|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.ActiveCfg = Debug|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Debug|x64.Build.0 = Debug|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release (static)|x64.Build.0 = Release (static)|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.ActiveCfg = Release|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|Win32.Build.0 = Release|Win32 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.ActiveCfg = Release|x64 - {B37FE734-01F4-4799-86B2-D084820715BE}.Release|x64.Build.0 = Release|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.ActiveCfg = Debug|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|Win32.Build.0 = Debug|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.ActiveCfg = Debug|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Debug|x64.Build.0 = Debug|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release (static)|x64.Build.0 = Release (static)|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.ActiveCfg = Release|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|Win32.Build.0 = Release|Win32 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.ActiveCfg = Release|x64 - {B00D4025-0437-4FF2-BD0E-D2AE6CF82AC2}.Release|x64.Build.0 = Release|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|Win32.Build.0 = Debug|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.ActiveCfg = Debug|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Debug|x64.Build.0 = Debug|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release (static)|x64.Build.0 = Release (static)|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.ActiveCfg = Release|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|Win32.Build.0 = Release|Win32 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.ActiveCfg = Release|x64 - {5E7E6110-89E8-4797-A8E3-EBEF0EF5CAF2}.Release|x64.Build.0 = Release|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.ActiveCfg = Debug|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|Win32.Build.0 = Debug|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.ActiveCfg = Debug|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Debug|x64.Build.0 = Debug|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release (static)|x64.Build.0 = Release (static)|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.ActiveCfg = Release|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|Win32.Build.0 = Release|Win32 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.ActiveCfg = Release|x64 - {E5D842C5-669F-4FC7-A5E0-44B562F86435}.Release|x64.Build.0 = Release|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.ActiveCfg = Debug|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|Win32.Build.0 = Debug|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.ActiveCfg = Debug|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Debug|x64.Build.0 = Debug|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release (static)|x64.Build.0 = Release (static)|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.ActiveCfg = Release|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|Win32.Build.0 = Release|Win32 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.ActiveCfg = Release|x64 - {445A2500-3BBC-449A-A929-C419C2A16051}.Release|x64.Build.0 = Release|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.ActiveCfg = Debug|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|Win32.Build.0 = Debug|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.ActiveCfg = Debug|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Debug|x64.Build.0 = Debug|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release (static)|x64.Build.0 = Release (static)|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.ActiveCfg = Release|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|Win32.Build.0 = Release|Win32 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.ActiveCfg = Release|x64 - {052C34FE-C9E2-43ED-95DA-FB3F27B44E37}.Release|x64.Build.0 = Release|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|Win32.Build.0 = Debug|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.ActiveCfg = Debug|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Debug|x64.Build.0 = Debug|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release (static)|x64.Build.0 = Release (static)|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.ActiveCfg = Release|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|Win32.Build.0 = Release|Win32 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.ActiveCfg = Release|x64 - {5FA27C8E-51B1-445A-A375-FBE74F0984B1}.Release|x64.Build.0 = Release|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.ActiveCfg = Debug|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|Win32.Build.0 = Debug|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.ActiveCfg = Debug|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Debug|x64.Build.0 = Debug|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release (static)|x64.Build.0 = Release (static)|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.ActiveCfg = Release|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|Win32.Build.0 = Release|Win32 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.ActiveCfg = Release|x64 - {56BD559B-1590-4FC4-B441-AB1973BAC2BD}.Release|x64.Build.0 = Release|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.ActiveCfg = Debug|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|Win32.Build.0 = Debug|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.ActiveCfg = Debug|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Debug|x64.Build.0 = Debug|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release (static)|x64.Build.0 = Release (static)|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.ActiveCfg = Release|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|Win32.Build.0 = Release|Win32 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.ActiveCfg = Release|x64 - {88422448-C5FB-46F3-A0B3-0811F90E537C}.Release|x64.Build.0 = Release|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.ActiveCfg = Debug|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|Win32.Build.0 = Debug|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.ActiveCfg = Debug|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Debug|x64.Build.0 = Debug|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release (static)|x64.Build.0 = Release (static)|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.ActiveCfg = Release|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|Win32.Build.0 = Release|Win32 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.ActiveCfg = Release|x64 - {9EE8BD4B-47D3-4AD5-A8B9-831329792A05}.Release|x64.Build.0 = Release|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.ActiveCfg = Debug|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|Win32.Build.0 = Debug|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.ActiveCfg = Debug|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Debug|x64.Build.0 = Debug|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release (static)|x64.Build.0 = Release (static)|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.ActiveCfg = Release|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|Win32.Build.0 = Release|Win32 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.ActiveCfg = Release|x64 - {4605418D-2292-470A-AB18-C2119B016F71}.Release|x64.Build.0 = Release|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.ActiveCfg = Debug|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|Win32.Build.0 = Debug|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.ActiveCfg = Debug|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Debug|x64.Build.0 = Debug|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release (static)|x64.Build.0 = Release (static)|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.ActiveCfg = Release|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|Win32.Build.0 = Release|Win32 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.ActiveCfg = Release|x64 - {05E68E3B-5901-43A9-981D-CF392C0F5C6C}.Release|x64.Build.0 = Release|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.ActiveCfg = Debug|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|Win32.Build.0 = Debug|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.ActiveCfg = Debug|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Debug|x64.Build.0 = Debug|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release (static)|x64.Build.0 = Release (static)|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.ActiveCfg = Release|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|Win32.Build.0 = Release|Win32 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.ActiveCfg = Release|x64 - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80}.Release|x64.Build.0 = Release|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.ActiveCfg = Debug|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|Win32.Build.0 = Debug|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.ActiveCfg = Debug|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Debug|x64.Build.0 = Debug|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release (static)|x64.Build.0 = Release (static)|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.ActiveCfg = Release|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|Win32.Build.0 = Release|Win32 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.ActiveCfg = Release|x64 - {1CD1A18B-95D5-4EA4-917C-34B10066BFCC}.Release|x64.Build.0 = Release|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.ActiveCfg = Debug|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|Win32.Build.0 = Debug|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.ActiveCfg = Debug|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Debug|x64.Build.0 = Debug|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release (static)|x64.Build.0 = Release (static)|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.ActiveCfg = Release|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|Win32.Build.0 = Release|Win32 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.ActiveCfg = Release|x64 - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5}.Release|x64.Build.0 = Release|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.ActiveCfg = Debug|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|Win32.Build.0 = Debug|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.ActiveCfg = Debug|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Debug|x64.Build.0 = Debug|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release (static)|x64.Build.0 = Release (static)|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.ActiveCfg = Release|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|Win32.Build.0 = Release|Win32 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.ActiveCfg = Release|x64 - {231C032C-DE16-459A-8E7D-6509C2EC3998}.Release|x64.Build.0 = Release|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.ActiveCfg = Debug|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|Win32.Build.0 = Debug|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.ActiveCfg = Debug|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Debug|x64.Build.0 = Debug|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release (static)|x64.Build.0 = Release (static)|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.ActiveCfg = Release|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|Win32.Build.0 = Release|Win32 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.ActiveCfg = Release|x64 - {419FEFBE-D9D5-4149-974B-0FFFC8D0D93F}.Release|x64.Build.0 = Release|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.ActiveCfg = Debug|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|Win32.Build.0 = Debug|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.ActiveCfg = Debug|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Debug|x64.Build.0 = Debug|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release (static)|x64.Build.0 = Release (static)|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.ActiveCfg = Release|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|Win32.Build.0 = Release|Win32 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.ActiveCfg = Release|x64 - {40639893-4D75-48CD-811F-4B363CC71FFA}.Release|x64.Build.0 = Release|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|Win32.Build.0 = Debug|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Debug|x64.ActiveCfg = Debug|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release (static)|x64.Build.0 = Release (static)|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.ActiveCfg = Release|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|Win32.Build.0 = Release|Win32 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.ActiveCfg = Release|x64 - {5FD733BF-B3C6-4A96-BED7-35E2484448E1}.Release|x64.Build.0 = Release|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.ActiveCfg = Debug|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|Win32.Build.0 = Debug|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Debug|x64.ActiveCfg = Debug|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release (static)|x64.Build.0 = Release (static)|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.ActiveCfg = Release|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|Win32.Build.0 = Release|Win32 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.ActiveCfg = Release|x64 - {649C4168-1C65-4E41-818F-85A1C52C1B8F}.Release|x64.Build.0 = Release|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.ActiveCfg = Debug|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|Win32.Build.0 = Debug|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Debug|x64.ActiveCfg = Debug|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release (static)|x64.Build.0 = Release (static)|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.ActiveCfg = Release|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|Win32.Build.0 = Release|Win32 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.ActiveCfg = Release|x64 - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F}.Release|x64.Build.0 = Release|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.ActiveCfg = Debug|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|Win32.Build.0 = Debug|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Debug|x64.ActiveCfg = Debug|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release (static)|x64.Build.0 = Release (static)|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.ActiveCfg = Release|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|Win32.Build.0 = Release|Win32 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.ActiveCfg = Release|x64 - {44A18410-3AA8-4A64-935B-D20223AD6885}.Release|x64.Build.0 = Release|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.ActiveCfg = Debug|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|Win32.Build.0 = Debug|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Debug|x64.ActiveCfg = Debug|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release (static)|x64.Build.0 = Release (static)|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.ActiveCfg = Release|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|Win32.Build.0 = Release|Win32 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.ActiveCfg = Release|x64 - {B44CB3E0-F2FD-4260-A632-C01FB881613E}.Release|x64.Build.0 = Release|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.ActiveCfg = Debug|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|Win32.Build.0 = Debug|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Debug|x64.ActiveCfg = Debug|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release (static)|x64.Build.0 = Release (static)|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.ActiveCfg = Release|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|Win32.Build.0 = Release|Win32 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.ActiveCfg = Release|x64 - {F4A9881E-0EB0-44A1-9664-B6CBDE992861}.Release|x64.Build.0 = Release|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.ActiveCfg = Debug|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|Win32.Build.0 = Debug|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Debug|x64.ActiveCfg = Debug|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release (static)|x64.Build.0 = Release (static)|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.ActiveCfg = Release|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|Win32.Build.0 = Release|Win32 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.ActiveCfg = Release|x64 - {66D3A191-E4D5-45F3-86BD-EFBB249CD554}.Release|x64.Build.0 = Release|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.ActiveCfg = Debug|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|Win32.Build.0 = Debug|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Debug|x64.ActiveCfg = Debug|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release (static)|x64.Build.0 = Release (static)|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.ActiveCfg = Release|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|Win32.Build.0 = Release|Win32 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.ActiveCfg = Release|x64 - {CBD0DD82-4DC7-4398-AF32-FD7BFFA3C2D5}.Release|x64.Build.0 = Release|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.ActiveCfg = Debug|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|Win32.Build.0 = Debug|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Debug|x64.ActiveCfg = Debug|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release (static)|x64.Build.0 = Release (static)|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.ActiveCfg = Release|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|Win32.Build.0 = Release|Win32 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.ActiveCfg = Release|x64 - {D5B9558F-EF25-4167-ACE4-723C7413B390}.Release|x64.Build.0 = Release|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.ActiveCfg = Debug|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|Win32.Build.0 = Debug|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Debug|x64.ActiveCfg = Debug|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release (static)|x64.Build.0 = Release (static)|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.ActiveCfg = Release|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|Win32.Build.0 = Release|Win32 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.ActiveCfg = Release|x64 - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70}.Release|x64.Build.0 = Release|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.ActiveCfg = Debug|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|Win32.Build.0 = Debug|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Debug|x64.ActiveCfg = Debug|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release (static)|x64.Build.0 = Release (static)|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.ActiveCfg = Release|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|Win32.Build.0 = Release|Win32 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.ActiveCfg = Release|x64 - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137}.Release|x64.Build.0 = Release|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|Win32.Build.0 = Debug|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Debug|x64.ActiveCfg = Debug|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release (static)|x64.Build.0 = Release (static)|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.ActiveCfg = Release|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|Win32.Build.0 = Release|Win32 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.ActiveCfg = Release|x64 - {7E30C3B1-AEE7-483D-B231-C672365CD2D7}.Release|x64.Build.0 = Release|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.ActiveCfg = Debug|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|Win32.Build.0 = Debug|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Debug|x64.ActiveCfg = Debug|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release (static)|x64.Build.0 = Release (static)|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.ActiveCfg = Release|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|Win32.Build.0 = Release|Win32 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.ActiveCfg = Release|x64 - {2E26DB8B-9E37-4072-B397-8A7086E0ACD0}.Release|x64.Build.0 = Release|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.ActiveCfg = Debug|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|Win32.Build.0 = Debug|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Debug|x64.ActiveCfg = Debug|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release (static)|x64.Build.0 = Release (static)|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.ActiveCfg = Release|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|Win32.Build.0 = Release|Win32 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.ActiveCfg = Release|x64 - {2736D4F9-EA8B-4ADF-B2D9-B705FF288A8A}.Release|x64.Build.0 = Release|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|Win32.Build.0 = Debug|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Debug|x64.ActiveCfg = Debug|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.ActiveCfg = Release (static)|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|Win32.Build.0 = Release (static)|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.ActiveCfg = Release (static)|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release (static)|x64.Build.0 = Release (static)|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.ActiveCfg = Release|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|Win32.Build.0 = Release|Win32 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.ActiveCfg = Release|x64 - {2CEB1965-A89C-4422-A9AC-B30FCE7913C3}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {9A942925-61E6-4975-935A-5D62E8248E64} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {6ADA4322-693A-46BB-897B-17BB5BE9F08C} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {6540C00F-C5EF-4C8B-824D-F2B7B302F0E0} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {51028ACF-53D4-4478-8500-55E6B8A81375} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {1311DEDF-B04C-4E96-BFDC-5D9FA0B05AC7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {ED4AFBF5-C247-4352-966D-048B8998C6A1} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {01C3B138-9D45-4ED6-A763-893C067262C2} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {ACCC6F49-7E06-4395-AAF4-3C03A68F49EB} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {2626C0E1-6F5C-47D3-B80D-93942D766DD7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {04FA9D77-E45F-4917-B972-B353BA6A6FA8} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {BF149D97-7520-4788-9CD1-3D99C5C8150F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {5203F034-0047-4EC0-B7E9-D037FAF5D536} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {E7B3D07D-2FE8-481B-8DAB-6255A412A42F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {BC1F021A-1EEC-4A7A-B746-5AA6048E478C} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {DE7E8FF8-0F5D-4062-A5C0-CFA3502E7A5A} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {226D42CE-5833-444E-94FA-84C1D51892A8} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {B37FE734-01F4-4799-86B2-D084820715BE} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {6BA39648-5BD0-4B8D-A8DD-8202FBA1AE80} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {053E1EE2-75B4-4D9A-B8AE-89600BCB60A5} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {C55D5FBF-43A0-4F6C-BCF6-BAE5705C121F} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {44A18410-3AA8-4A64-935B-D20223AD6885} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {F4A9881E-0EB0-44A1-9664-B6CBDE992861} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {66D3A191-E4D5-45F3-86BD-EFBB249CD554} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {D5B9558F-EF25-4167-ACE4-723C7413B390} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {155112B9-A8A9-4E06-90F5-4AAAB32B2F70} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {178D81A7-F2FB-41D7-B300-9D1A4DE5E137} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - {7E30C3B1-AEE7-483D-B231-C672365CD2D7} = {3CDA2798-7565-47C5-B972-F9E63DBEFFFA} - EndGlobalSection -EndGlobal diff --git a/vc2008/bsp2img/bsp2img.vcproj b/vc2008/bsp2img/bsp2img.vcproj deleted file mode 100644 index b4608c799..000000000 --- a/vc2008/bsp2img/bsp2img.vcproj +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/builtins/builtins.vcproj b/vc2008/builtins/builtins.vcproj deleted file mode 100644 index 43fa081df..000000000 --- a/vc2008/builtins/builtins.vcproj +++ /dev/null @@ -1,474 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/clean.ps1 b/vc2008/clean.ps1 deleted file mode 100644 index b1e75f990..000000000 --- a/vc2008/clean.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -ls -recurse -include 'win32','x64','*.user' | rm -recurse -if(test-path QuakeForge.suo) { rm QuakeForge.suo -force } -if(test-path QuakeForge.ncb) { rm QuakeForge.ncb } \ No newline at end of file diff --git a/vc2008/common/common.vcproj b/vc2008/common/common.vcproj deleted file mode 100644 index 7c1404ac7..000000000 --- a/vc2008/common/common.vcproj +++ /dev/null @@ -1,490 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/console/console.vcproj b/vc2008/console/console.vcproj deleted file mode 100644 index f93f3975f..000000000 --- a/vc2008/console/console.vcproj +++ /dev/null @@ -1,494 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/console_client/console_client.vcproj b/vc2008/console_client/console_client.vcproj deleted file mode 100644 index 0e2a378b0..000000000 --- a/vc2008/console_client/console_client.vcproj +++ /dev/null @@ -1,482 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/console_server/console_server.vcproj b/vc2008/console_server/console_server.vcproj deleted file mode 100644 index 33a611997..000000000 --- a/vc2008/console_server/console_server.vcproj +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/engine/engine.vcproj b/vc2008/engine/engine.vcproj deleted file mode 100644 index 203710bf7..000000000 --- a/vc2008/engine/engine.vcproj +++ /dev/null @@ -1,510 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/gib/gib.vcproj b/vc2008/gib/gib.vcproj deleted file mode 100644 index 3fbb039b6..000000000 --- a/vc2008/gib/gib.vcproj +++ /dev/null @@ -1,538 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/hw-master/hw-master.vcproj b/vc2008/hw-master/hw-master.vcproj deleted file mode 100644 index 0e7273e3b..000000000 --- a/vc2008/hw-master/hw-master.vcproj +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/image/image.vcproj b/vc2008/image/image.vcproj deleted file mode 100644 index 73970fb11..000000000 --- a/vc2008/image/image.vcproj +++ /dev/null @@ -1,482 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/include/config.h b/vc2008/include/config.h deleted file mode 100644 index 1b787db16..000000000 --- a/vc2008/include/config.h +++ /dev/null @@ -1,740 +0,0 @@ -/* include/config.h. Generated from config.h.in by configure. */ -/* include/config.h.in. Generated from configure.ac by autoheader. */ - -/* list of cd plugins */ -#define CD_PLUGIN_LIST {"cd_win", cd_win_PluginInfo},{0, 0} - -/* list of cd prototypes */ -#define CD_PLUGIN_PROTOS extern plugin_t *cd_win_PluginInfo (void); - -/* list of client plugins */ -#define CLIENT_PLUGIN_LIST {"console_client", console_client_PluginInfo},{0, 0} - -/* list of client prototypes */ -#define CLIENT_PLUGIN_PROTOS extern plugin_t *console_client_PluginInfo (void); - -/* Define this to the command line for the C preprocessor */ -#define CPP_NAME "wave --c99 %d -o %o %i" - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define this to the location of the global config file */ -#define FS_GLOBALCFG "~/quakeforge.conf" - -/* Define this to the path from which to load plugins */ -#define FS_PLUGINPATH "/usr/local/lib/quakeforge" - -/* Define this to the shared game directory root */ -#define FS_SHAREPATH "." - -/* Define this to the location of the user config file */ -#define FS_USERCFG "~/quakeforgerc" - -/* Define this to the unshared game directory root */ -#define FS_USERPATH "." - -/* Define this to the default GL dynamic lib */ -#define GL_DRIVER "OPENGL32.DLL" - -/* Define to 1 if you have the `access' function. */ -#define HAVE_ACCESS 1 - -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define this if alloca is prototyped */ -/* #undef HAVE_ALLOCA_PROTO */ -#ifndef HAVE_ALLOCA_PROTO -#ifndef QFASM -void *alloca (int size); -#endif -#endif - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ALSA_ASOUNDLIB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ARPA_INET_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ASM_IO_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_ASSERT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_CONIO_H 1 - -/* Define to 1 if you have the `connect' function. */ -#define HAVE_CONNECT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_CTYPE_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_CURSES_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DDRAW_H 1 - -/* Define if you have the XFree86 DGA extension */ -/* #undef HAVE_DGA */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DINPUT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DIRECT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DIRENT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define if you have the dlopen function. */ -/* #undef HAVE_DLOPEN */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DMEDIA_AUDIO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DMEDIA_CDAUDIO_H */ - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -/* #undef HAVE_DOPRNT */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DPMI_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DSOUND_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_EXECINFO_H */ - -/* Define this if you have FB_AUX_VGA_PLANES_CFB4 */ -/* #undef HAVE_FB_AUX_VGA_PLANES_CFB4 */ - -/* Define this if you have FB_AUX_VGA_PLANES_CFB4 */ -/* #undef HAVE_FB_AUX_VGA_PLANES_CFB8 */ - -/* Define this if you have FB_AUX_VGA_PLANES_VGA4 */ -/* #undef HAVE_FB_AUX_VGA_PLANES_VGA4 */ - -/* Define to 1 if you have the `fcntl' function. */ -/* #undef HAVE_FCNTL */ - -/* Define to 1 if you have the header file. */ -#define HAVE_FCNTL_H 1 - -/* define this if you have flac libs */ -/* #undef HAVE_FLAC */ - -/* Define to 1 if you have the header file. */ -#define HAVE_FNMATCH_H 1 - -/* Define this if fnmatch is prototyped in fnmatch.h */ -/* #undef HAVE_FNMATCH_PROTO */ - -/* Define this if FPOS_T is a struct */ -/* #undef HAVE_FPOS_T_STRUCT */ - -/* Define to 1 if you have the `ftime' function. */ -#define HAVE_FTIME 1 - -/* Define to 1 if you have the `getaddrinfo' function. */ -#define HAVE_GETADDRINFO 1 - -/* Define to 1 if you have the `gethostbyname' function. */ -#define HAVE_GETHOSTBYNAME 1 - -/* Define to 1 if you have the `gethostname' function. */ -#define HAVE_GETHOSTNAME 1 - -/* Define to 1 if you have the `getnameinfo' function. */ -#define HAVE_GETNAMEINFO 1 - -/* Define to 1 if you have the `getpagesize' function. */ -/* #undef HAVE_GETPAGESIZE */ - -/* Define to 1 if you have the `gettimeofday' function. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define to 1 if you have the `getwd' function. */ -/* #undef HAVE_GETWD */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* Define this if your system has struct in_pktinfo */ -/* #undef HAVE_IN_PKTINFO */ - -/* Define to 1 if you have the header file. */ -#define HAVE_IO_H 1 - -/* Define this if you want IPv6 support */ -/* #undef HAVE_IPV6 */ - -/* Define if you have libjack */ -/* #undef HAVE_JACK */ - -/* Define to 1 if you have a functional curl library. */ -#define HAVE_LIBCURL 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LIBC_H */ - -/* Define to 1 if you have the `db' library (-ldb). */ -/* #undef HAVE_LIBDB */ - -/* Define to 1 if you have the `efence' library (-lefence). */ -/* #undef HAVE_LIBEFENCE */ - -/* Define to 1 if you have the `m' library (-lm). */ -/* #undef HAVE_LIBM */ - -/* Define to 1 if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_CDROM_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_FB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_JOYSTICK_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_LINUX_SOUNDCARD_H */ - -/* Define to 1 if you support file names longer than 14 characters. */ -#define HAVE_LONG_FILE_NAMES 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MACHINE_SOUNDCARD_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_MALLOC_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MATH_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MGRAPH_H */ - -/* Define to 1 if you have the `mkdir' function. */ -#define HAVE_MKDIR 1 - -/* Define to 1 if you have a working `mmap' system call. */ -/* #undef HAVE_MMAP */ - -/* Define to 1 if you have the `mprotect' function. */ -/* #undef HAVE_MPROTECT */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_NETDB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_NETINET_IN_H */ - -/* Define if you have libpng */ -/* #undef HAVE_PNG */ - -/* Define to 1 if you have the header file. */ -#define HAVE_PROCESS_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_PTHREAD_H */ - -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_PWD_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_RPC_TYPES_H */ - -/* Define this if you have sa_len member in struct sockaddr (BSD) */ -/* #undef HAVE_SA_LEN */ - -/* Define to 1 if you have the `select' function. */ -#define HAVE_SELECT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SETJMP_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SIGNAL_H 1 - -/* Define this if you have sin6_len member in struct sockaddr_in6 (BSD) */ -/* #undef HAVE_SIN6_LEN */ - -/* Define this if your system has size_t */ -#define HAVE_SIZE_T 1 - -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if you have the `socket' function. */ -#define HAVE_SOCKET 1 - -/* Define this if your system has socklen_t */ -/* #undef HAVE_SOCKLEN_T */ - -/* Define this if you have ss_len member in struct sockaddr_storage (BSD) */ -/* #undef HAVE_SS_LEN */ - -/* Define to 1 if you have the `stat' function. */ -#define HAVE_STAT 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDARG_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDIO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasestr' function. */ -/* #undef HAVE_STRCASESTR */ - -/* Define this if strcasestr is prototyped in string.h */ -/* #undef HAVE_STRCASESTR_PROTO */ - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STRINGS_H 1 */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strnlen' function. */ -#define HAVE_STRNLEN 1 - -/* Define this if strnlen is prototyped in string.h */ -#define HAVE_STRNLEN_PROTO 1 - -/* Define to 1 if you have the `strsep' function. */ -/* #undef HAVE_STRSEP */ - -/* Define to 1 if you have the `strstr' function. */ -#define HAVE_STRSTR 1 - -/* Define to 1 if `st_blksize' is member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */ - -/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ -/* #undef HAVE_ST_BLKSIZE */ - -/* Define this if C symbols are prefixed with an underscore */ -#define HAVE_SYM_PREFIX_UNDERSCORE 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_ASOUNDLIB_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_AUDIOIO_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_FILIO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IOCTL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IO_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_IPC_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_MMAN_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_PARAM_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_POLL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SHM_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SIGNAL_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SOCKET_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_SOUNDCARD_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIME_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_UIO_H */ - -/* Define to 1 if you have that is POSIX.1 compatible. */ -/* #undef HAVE_SYS_WAIT_H */ - -/* Define this if you have tchar.h */ -#define HAVE_TCHAR_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_TERMIOS_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_TIME_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_UNISTD_H */ - -/* Define to 1 if you have the `usleep' function. */ -/* #undef HAVE_USLEEP */ - -/* Define if va_copy is available */ -/* #undef HAVE_VA_COPY */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_VGAKEYBOARD_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_VGAMOUSE_H */ - -/* Define if you have the XFree86 VIDMODE extension */ -/* #undef HAVE_VIDMODE */ - -/* define this if you have ogg/vorbis libs */ -/* #undef HAVE_VORBIS */ - -/* Define to 1 if you have the `vprintf' function. */ -#define HAVE_VPRINTF 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - -/* Define if you have WildMidi */ -/* #undef HAVE_WILDMIDI */ - -/* Define to 1 if you have the header file. */ -#define HAVE_WINDOWS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_WINSOCK_H 1 - -/* Define if you have XMMS */ -/* #undef HAVE_XMMS */ - -/* Define if you have zlib */ -#define HAVE_ZLIB 1 - -/* Define to 1 if you have the `_access' function. */ -#define HAVE__ACCESS 1 - -/* Define to 1 if you have the `_ftime' function. */ -#define HAVE__FTIME 1 - -/* Define to 1 if you have the <_mingw.h> header file. */ -/* #undef HAVE__MINGW_H */ - -/* Define to 1 if you have the `_mkdir' function. */ -#define HAVE__MKDIR 1 - -/* Define this if you have _SC_PAGESIZE */ -/* #undef HAVE__SC_PAGESIZE */ - -/* Define to 1 if you have the `_snprintf' function. */ -#define HAVE__SNPRINTF 1 - -/* Define if __va_copy is available */ -/* #undef HAVE__VA_COPY */ - -/* Define to 1 if you have the `_vsnprintf' function. */ -#define HAVE__VSNPRINTF 1 - -/* Define this if the GCC __attribute__ keyword is available */ -/* #undef HAVE___ATTRIBUTE__ */ - -#ifndef HAVE___ATTRIBUTE__ -# define __attribute__(x) -#endif - -/* Define this if the GCC __attribute__ keyword is available */ -/* #undef HAVE___ATTRIBUTE__VISIBILITY */ - -#ifdef HAVE___ATTRIBUTE__VISIBILITY -# define VISIBLE __attribute__((visibility ("default"))) -#else -# define VISIBLE -#endif - -/* Define this if the GCC __builtin_expect keyword is available */ -/* #undef HAVE___BUILTIN_EXPECT */ - -#ifndef HAVE___BUILTIN_EXPECT -# define __builtin_expect(x,c) x -#endif - -/* Defined if libcurl supports AsynchDNS */ -/* #undef LIBCURL_FEATURE_ASYNCHDNS */ - -/* Defined if libcurl supports IDN */ -#define LIBCURL_FEATURE_IDN 1 - -/* Defined if libcurl supports IPv6 */ -#define LIBCURL_FEATURE_IPV6 1 - -/* Defined if libcurl supports KRB4 */ -/* #undef LIBCURL_FEATURE_KRB4 */ - -/* Defined if libcurl supports libz */ -#define LIBCURL_FEATURE_LIBZ 1 - -/* Defined if libcurl supports NTLM */ -#define LIBCURL_FEATURE_NTLM 1 - -/* Defined if libcurl supports SSL */ -/* #undef LIBCURL_FEATURE_SSL */ - -/* Defined if libcurl supports SSPI */ -#define LIBCURL_FEATURE_SSPI 1 - -/* Defined if libcurl supports DICT */ -/* #undef LIBCURL_PROTOCOL_DICT */ - -/* Defined if libcurl supports FILE */ -/* #undef LIBCURL_PROTOCOL_FILE */ - -/* Defined if libcurl supports FTP */ -#define LIBCURL_PROTOCOL_FTP 1 - -/* Defined if libcurl supports FTPS */ -/* #undef LIBCURL_PROTOCOL_FTPS */ - -/* Defined if libcurl supports HTTP */ -#define LIBCURL_PROTOCOL_HTTP 1 - -/* Defined if libcurl supports HTTPS */ -/* #undef LIBCURL_PROTOCOL_HTTPS */ - -/* Defined if libcurl supports LDAP */ -/* #undef LIBCURL_PROTOCOL_LDAP */ - -/* Defined if libcurl supports TELNET */ -/* #undef LIBCURL_PROTOCOL_TELNET */ - -/* Defined if libcurl supports TFTP */ -/* #undef LIBCURL_PROTOCOL_TFTP */ - -/* Define to 1 if `major', `minor', and `makedev' are declared in . - */ -/* #undef MAJOR_IN_MKDEV */ - -/* Define to 1 if `major', `minor', and `makedev' are declared in - . */ -/* #undef MAJOR_IN_SYSMACROS */ - -/* Define this to the QSG standard version you support in NetQuake */ -#define NQ_QSG_VERSION "1.0" - -/* Define this to the NetQuake standard version you support */ -#define NQ_VERSION "1.09" - -/* Name of package */ -#define PACKAGE "quakeforge" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" - -/* Define this to your operating system's path separator character */ -#define PATH_SEPARATOR '/' - -/* "Proper" package name */ -#define PROGRAM "QuakeForge" - -/* Define this to where qfcc should look for header files */ -#define QFCC_INCLUDE_PATH "/usr/local/include/QF/ruamoko" - -/* Define this to where qfcc should look for lib files */ -#define QFCC_LIB_PATH "/usr/local/lib/ruamoko" - -/* Define this to the QSG standard version you support in QuakeWorld */ -#define QW_QSG_VERSION "2.0" - -/* Define this to the QuakeWorld standard version you support */ -#define QW_VERSION "2.40" - -/* Define as the return type of signal handlers (`int' or `void'). */ -#define RETSIGTYPE void - -/* list of server plugins */ -#define SERVER_PLUGIN_LIST {"console_server", console_server_PluginInfo},{0, 0} - -/* list of server prototypes */ -#define SERVER_PLUGIN_PROTOS extern plugin_t *console_server_PluginInfo (void); - -/* Define this to the default sound output driver. */ -#define SND_OUTPUT_DEFAULT "win" - -/* list of sound output plugins */ -#define SND_OUTPUT_LIST {"snd_output_win", snd_output_win_PluginInfo},{0, 0} - -/* list of sound output prototypes */ -#define SND_OUTPUT_PROTOS extern plugin_t *snd_output_win_PluginInfo (void); - -/* list of sound render plugins */ -#define SND_RENDER_LIST {"snd_render_default", snd_render_default_PluginInfo},{0, 0} - -/* list of sound render prototypes */ -#define SND_RENDER_PROTOS extern plugin_t *snd_render_default_PluginInfo (void); - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ - -/* Define this if you are building static plugins */ -#define STATIC_PLUGINS 1 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Define to 1 if your declares `struct tm'. */ -/* #undef TM_IN_SYS_TIME */ - -/* Define this if you want progs typechecking */ -/* #undef TYPECHECK_PROGS */ - -/* Define this if you want to use Intel assembly optimizations */ -/* #undef USE_INTEL_ASM */ - -/* Define if va_list is an array */ -/* #undef VA_LIST_IS_ARRAY */ - -/* Version number of package */ -#define VERSION "0.5.5-SVN" - -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ - -/* Define to 1 if the X Window System is missing or not being used. */ -/* #undef X_DISPLAY_MISSING */ - -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ -/* #undef YYTEXT_POINTER */ - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define curl_free() as free() if our version of curl lacks curl_free. */ -/* #undef curl_free */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#define inline __inline -/* #undef inline */ -#endif - -/* Define to `unsigned int' if does not define. */ -/* #undef size_t */ - -/* Define strcasecmp as stricmp if you have one but not the other */ -#define strcasecmp stricmp - -/* new stuff, for VC2005 compatibility (phrosty) */ - -#define _CRT_SECURE_NO_WARNINGS -#define _CRT_NONSTDC_NO_WARNINGS - -/* used in qfcc. should #define to _ReturnAddress()? */ -#define __builtin_return_address(x) (0) - -#define _WIN32_WINNT 0x0500 -#define DIRECTINPUT_VERSION 0x0600 - -#define INITGUID - -#define snprintf _snprintf -#define strncasecmp strnicmp - -#define ssize_t ptrdiff_t -#define S_ISDIR(mode) (mode & _S_IFDIR) - -/* used in access() */ -#define R_OK 04 - -/* - disable silent conversion warnings for fixing later.. - - 4047: 'operator' : 'identifier1' differs in levels of indirection from 'identifier2' - 4244: 'argument' : conversion from 'type1' to 'type2', possible loss of data - 4267: 'var' : conversion from 'size_t' to 'type', possible loss of data (/Wp64 warning) - 4305: 'identifier' : truncation from 'type1' to 'type2' - 4311: 'variable' : pointer truncation from 'type' to 'type' (/Wp64 warning) - 4312: 'operation' : conversion from 'type1' to 'type2' of greater size (/Wp64 warning) -*/ -#pragma warning(disable:4047 4244 4267 4305 4311 4312) diff --git a/vc2008/models-sw/models-sw.vcproj b/vc2008/models-sw/models-sw.vcproj deleted file mode 100644 index e8aa3d541..000000000 --- a/vc2008/models-sw/models-sw.vcproj +++ /dev/null @@ -1,512 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/models/models.vcproj b/vc2008/models/models.vcproj deleted file mode 100644 index cacad0007..000000000 --- a/vc2008/models/models.vcproj +++ /dev/null @@ -1,490 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/modelsgl/modelsgl.vcproj b/vc2008/modelsgl/modelsgl.vcproj deleted file mode 100644 index 128903bd5..000000000 --- a/vc2008/modelsgl/modelsgl.vcproj +++ /dev/null @@ -1,522 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/net-main/net-main.vcproj b/vc2008/net-main/net-main.vcproj deleted file mode 100644 index 8f33ca46c..000000000 --- a/vc2008/net-main/net-main.vcproj +++ /dev/null @@ -1,488 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/net/net.vcproj b/vc2008/net/net.vcproj deleted file mode 100644 index b79e2718b..000000000 --- a/vc2008/net/net.vcproj +++ /dev/null @@ -1,474 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/nq-common/nq-common.vcproj b/vc2008/nq-common/nq-common.vcproj deleted file mode 100644 index f5e82ed15..000000000 --- a/vc2008/nq-common/nq-common.vcproj +++ /dev/null @@ -1,516 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/nq-sdl/nq-sdl.vcproj b/vc2008/nq-sdl/nq-sdl.vcproj deleted file mode 100644 index 73f38ada0..000000000 --- a/vc2008/nq-sdl/nq-sdl.vcproj +++ /dev/null @@ -1,556 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/nq-sdl32/nq-sdl32.vcproj b/vc2008/nq-sdl32/nq-sdl32.vcproj deleted file mode 100644 index 1e9ffcae2..000000000 --- a/vc2008/nq-sdl32/nq-sdl32.vcproj +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/nq-server/nq-server.vcproj b/vc2008/nq-server/nq-server.vcproj deleted file mode 100644 index 202f9b6f2..000000000 --- a/vc2008/nq-server/nq-server.vcproj +++ /dev/null @@ -1,566 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/nq-sgl/nq-sgl.vcproj b/vc2008/nq-sgl/nq-sgl.vcproj deleted file mode 100644 index f6e9bc3b1..000000000 --- a/vc2008/nq-sgl/nq-sgl.vcproj +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/nq-wgl/nq-wgl.vcproj b/vc2008/nq-wgl/nq-wgl.vcproj deleted file mode 100644 index 6453a12bd..000000000 --- a/vc2008/nq-wgl/nq-wgl.vcproj +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/nq/nq.vcproj b/vc2008/nq/nq.vcproj deleted file mode 100644 index 220f0ff7a..000000000 --- a/vc2008/nq/nq.vcproj +++ /dev/null @@ -1,544 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/pak/pak.vcproj b/vc2008/pak/pak.vcproj deleted file mode 100644 index b5cd0bec8..000000000 --- a/vc2008/pak/pak.vcproj +++ /dev/null @@ -1,566 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qfbsp/qfbsp.vcproj b/vc2008/qfbsp/qfbsp.vcproj deleted file mode 100644 index 97462b79e..000000000 --- a/vc2008/qfbsp/qfbsp.vcproj +++ /dev/null @@ -1,632 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qfcc/FlexBison.rules b/vc2008/qfcc/FlexBison.rules deleted file mode 100644 index 0e4c1e3dc..000000000 --- a/vc2008/qfcc/FlexBison.rules +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qfcc/qfcc.vcproj b/vc2008/qfcc/qfcc.vcproj deleted file mode 100644 index 59bc03f84..000000000 --- a/vc2008/qfcc/qfcc.vcproj +++ /dev/null @@ -1,965 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qfclient/qfclient.vcproj b/vc2008/qfclient/qfclient.vcproj deleted file mode 100644 index 8739a5098..000000000 --- a/vc2008/qfclient/qfclient.vcproj +++ /dev/null @@ -1,626 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qflight/qflight.vcproj b/vc2008/qflight/qflight.vcproj deleted file mode 100644 index 3fc0ab1d6..000000000 --- a/vc2008/qflight/qflight.vcproj +++ /dev/null @@ -1,620 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qfmodelgen/qfmodelgen.vcproj b/vc2008/qfmodelgen/qfmodelgen.vcproj deleted file mode 100644 index 893da110a..000000000 --- a/vc2008/qfmodelgen/qfmodelgen.vcproj +++ /dev/null @@ -1,578 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qfprogs/qfprogs.vcproj b/vc2008/qfprogs/qfprogs.vcproj deleted file mode 100644 index 5141f8959..000000000 --- a/vc2008/qfprogs/qfprogs.vcproj +++ /dev/null @@ -1,590 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qfserver/qfserver.vcproj b/vc2008/qfserver/qfserver.vcproj deleted file mode 100644 index 909324104..000000000 --- a/vc2008/qfserver/qfserver.vcproj +++ /dev/null @@ -1,672 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qfvis/qfvis.vcproj b/vc2008/qfvis/qfvis.vcproj deleted file mode 100644 index 479049560..000000000 --- a/vc2008/qfvis/qfvis.vcproj +++ /dev/null @@ -1,588 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qfwavinfo/qfwavinfo.vcproj b/vc2008/qfwavinfo/qfwavinfo.vcproj deleted file mode 100644 index 40df9c014..000000000 --- a/vc2008/qfwavinfo/qfwavinfo.vcproj +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qtv/qtv.vcproj b/vc2008/qtv/qtv.vcproj deleted file mode 100644 index 0e2bb2d4b..000000000 --- a/vc2008/qtv/qtv.vcproj +++ /dev/null @@ -1,594 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qw-client-sdl/qw-client-sdl.vcproj b/vc2008/qw-client-sdl/qw-client-sdl.vcproj deleted file mode 100644 index 983be0451..000000000 --- a/vc2008/qw-client-sdl/qw-client-sdl.vcproj +++ /dev/null @@ -1,558 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qw-client-sdl32/qw-client-sdl32.vcproj b/vc2008/qw-client-sdl32/qw-client-sdl32.vcproj deleted file mode 100644 index 33a31293d..000000000 --- a/vc2008/qw-client-sdl32/qw-client-sdl32.vcproj +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qw-client-sgl/qw-client-sgl.vcproj b/vc2008/qw-client-sgl/qw-client-sgl.vcproj deleted file mode 100644 index 2842872d1..000000000 --- a/vc2008/qw-client-sgl/qw-client-sgl.vcproj +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qw-client-wgl/qw-client-wgl.vcproj b/vc2008/qw-client-wgl/qw-client-wgl.vcproj deleted file mode 100644 index 0a2c37256..000000000 --- a/vc2008/qw-client-wgl/qw-client-wgl.vcproj +++ /dev/null @@ -1,558 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qw-master/qw-master.vcproj b/vc2008/qw-master/qw-master.vcproj deleted file mode 100644 index 4d7961feb..000000000 --- a/vc2008/qw-master/qw-master.vcproj +++ /dev/null @@ -1,562 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/qw/qw.vcproj b/vc2008/qw/qw.vcproj deleted file mode 100644 index e5cb0be82..000000000 --- a/vc2008/qw/qw.vcproj +++ /dev/null @@ -1,474 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/readme.txt b/vc2008/readme.txt deleted file mode 100644 index b4ad78741..000000000 --- a/vc2008/readme.txt +++ /dev/null @@ -1,25 +0,0 @@ -Requirements -============= -- Visual C++ 2008 SP1 -- DirectX SDK (for DirectInput) -- SDL (required for sdl, sdl32, and sgl builds) -- bison/flex (required for qfcc, needs to be in your compiler path) - -Optional -========= -- zlib (#undef HAVE_ZLIB from vc2008/include/config.h if you don't want - this). Expects zlib.lib and zlib.dll for Debug/Release builds, and - libzlib.lib for Release (static) build. -- libcurl (#undef HAVE_LIBCURL from vc2008/include/config.h if you don't - want this). Expects curl.lib and curl.dll for Debug/Release builds, - and libcurl.lib for Release (static) build. - -Notes -====== -By default, qfcc is configured to use the Boost Wave preprocessor. You -can get this from http://www.boost.org, or change the CPP_NAME #define in -vc2008/include/config.h to whatever preprocessor you want. If you have -GCC, you can simply replace "wave --c99" with "gcc" in the define and it -should work. - -clean.ps1 is a Windows Powershell script that cleans up any build files. diff --git a/vc2008/ruamoko/ruamoko.vcproj b/vc2008/ruamoko/ruamoko.vcproj deleted file mode 100644 index 924c02f7c..000000000 --- a/vc2008/ruamoko/ruamoko.vcproj +++ /dev/null @@ -1,518 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/sound/sound.vcproj b/vc2008/sound/sound.vcproj deleted file mode 100644 index fe681171d..000000000 --- a/vc2008/sound/sound.vcproj +++ /dev/null @@ -1,514 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/util/util.vcproj b/vc2008/util/util.vcproj deleted file mode 100644 index e680f491d..000000000 --- a/vc2008/util/util.vcproj +++ /dev/null @@ -1,618 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/video-sdl/video-sdl.vcproj b/vc2008/video-sdl/video-sdl.vcproj deleted file mode 100644 index 2b03f2566..000000000 --- a/vc2008/video-sdl/video-sdl.vcproj +++ /dev/null @@ -1,472 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/video-sgl/video-sgl.vcproj b/vc2008/video-sgl/video-sgl.vcproj deleted file mode 100644 index 920a06e47..000000000 --- a/vc2008/video-sgl/video-sgl.vcproj +++ /dev/null @@ -1,468 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/video-sw/video-sw.vcproj b/vc2008/video-sw/video-sw.vcproj deleted file mode 100644 index 75f419ae0..000000000 --- a/vc2008/video-sw/video-sw.vcproj +++ /dev/null @@ -1,596 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/video-sw32/video-sw32.vcproj b/vc2008/video-sw32/video-sw32.vcproj deleted file mode 100644 index fc6bc6054..000000000 --- a/vc2008/video-sw32/video-sw32.vcproj +++ /dev/null @@ -1,572 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/video-wgl/video-wgl.vcproj b/vc2008/video-wgl/video-wgl.vcproj deleted file mode 100644 index a0b315c7c..000000000 --- a/vc2008/video-wgl/video-wgl.vcproj +++ /dev/null @@ -1,472 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/video/video.vcproj b/vc2008/video/video.vcproj deleted file mode 100644 index 737ecfe59..000000000 --- a/vc2008/video/video.vcproj +++ /dev/null @@ -1,538 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/videogl/videogl.vcproj b/vc2008/videogl/videogl.vcproj deleted file mode 100644 index 44d30c3fc..000000000 --- a/vc2008/videogl/videogl.vcproj +++ /dev/null @@ -1,556 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vc2008/wad/wad.vcproj b/vc2008/wad/wad.vcproj deleted file mode 100644 index 11fc5737d..000000000 --- a/vc2008/wad/wad.vcproj +++ /dev/null @@ -1,574 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -