qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-30 16:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename the -wgl targets to -win.

Browse source 
And add the necessary libs. Almost there :)
This commit is contained in:
Bill Currie 2013-01-24 12:32:18 +09:00
parent d7e98dcd6d
commit bf5eeb873e
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
nq/source/Makefile.am
View file

@ -36,7 +36,7 @@ AM_CFLAGS= @PTHREAD_CFLAGS@
bin_PROGRAMS= @NQ_TARGETS@ bin_PROGRAMS= @NQ_TARGETS@
EXTRA_PROGRAMS= nq-fbdev nq-sdl nq-svga nq-wgl nq-x11 nq-server EXTRA_PROGRAMS= nq-fbdev nq-sdl nq-svga nq-win nq-x11 nq-server
noinst_LIBRARIES= @nq_libs@ noinst_LIBRARIES= @nq_libs@
EXTRA_LIBRARIES=libnq_client.a libnq_common.a libnq_sdl.a libnq_server.a EXTRA_LIBRARIES=libnq_client.a libnq_common.a libnq_sdl.a libnq_server.a
@ -144,17 +144,18 @@ nq_x11_DEPENDENCIES= $(nq_x11_libs)
# OpenGL-using targets # OpenGL-using targets
# ... SGI/Microsoft WGL (Windows OpenGL) # ... Microsoft Windows
nq_wgl_libs= \ nq_win_libs= \
$(client_libs) \ $(client_libs) \
$(cl_plugin_LIBS) \ $(cl_plugin_LIBS) \
$(opengl_QFLIBS) \ $(top_builddir)/libs/video/renderer/libQFrenderer.la \
$(top_builddir)/libs/video/targets/libQFwgl.la \ $(top_builddir)/libs/models/libQFmodels.la \
$(top_builddir)/libs/video/targets/libQFwin.la \
$(client_LIBS) $(client_LIBS)
nq_wgl_SOURCES= sys_win.c nq_win_SOURCES= sys_win.c
nq_wgl_LDADD= $(nq_wgl_libs) -lgdi32 -lcomctl32 -lwinmm $(NET_LIBS) nq_win_LDADD= $(nq_win_libs) -lgdi32 -lcomctl32 -lwinmm $(NET_LIBS)
nq_wgl_LDFLAGS= $(common_ldflags) nq_win_LDFLAGS= $(common_ldflags)
nq_wgl_DEPENDENCIES= $(nq_wgl_libs) nq_win_DEPENDENCIES= $(nq_win_libs)
# Dedicated Server # Dedicated Server
if SYSTYPE_WIN32 if SYSTYPE_WIN32

19
qw/source/Makefile.am
View file

@ -37,7 +37,7 @@ AM_CFLAGS= @PTHREAD_CFLAGS@
bin_PROGRAMS= @QW_TARGETS@ bin_PROGRAMS= @QW_TARGETS@
EXTRA_PROGRAMS= \ EXTRA_PROGRAMS= \
qw-client-fbdev qw-client-sdl qw-client-svga qw-client-wgl qw-client-x11 \ qw-client-fbdev qw-client-sdl qw-client-svga qw-client-win qw-client-x11 \
qw-server qw-master qw-server qw-master
noinst_LIBRARIES= @qw_libs@ noinst_LIBRARIES= @qw_libs@
@ -172,17 +172,18 @@ qw_client_x11_LDADD= $(qw_client_x11_libs) \
qw_client_x11_LDFLAGS= $(common_ldflags) qw_client_x11_LDFLAGS= $(common_ldflags)
qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs) qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
# ... SGI/Microsoft WGL (Windows OpenGL) # ... Microsoft Windows
qw_client_wgl_libs= \ qw_client_win_libs= \
$(client_libs) \ $(client_libs) \
$(cl_plugin_LIBS) \ $(cl_plugin_LIBS) \
$(opengl_LIBS) \ $(top_builddir)/libs/video/renderer/libQFrenderer.la \
$(top_builddir)/libs/video/targets/libQFwgl.la \ $(top_builddir)/libs/models/libQFmodels.la \
$(top_builddir)/libs/video/targets/libQFwin.la \
$(client_LIBS) $(client_LIBS)
qw_client_wgl_SOURCES= cl_sys_win.c qw_client_win_SOURCES= cl_sys_win.c
qw_client_wgl_LDADD= $(qw_client_wgl_libs) -lgdi32 -lwinmm $(NET_LIBS) $(LIBCURL_LIBS) qw_client_win_LDADD= $(qw_client_win_libs) -lgdi32 -lwinmm $(NET_LIBS) $(LIBCURL_LIBS)
qw_client_wgl_LDFLAGS= $(common_ldflags) qw_client_win_LDFLAGS= $(common_ldflags)
qw_client_wgl_DEPENDENCIES= $(qw_client_wgl_libs) qw_client_win_DEPENDENCIES= $(qw_client_win_libs)
# Stuff that doesn't get linked into an executable NEEDS to be mentioned here, # Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
# or it won't be distributed with 'make dist' # or it won't be distributed with 'make dist'