Standardize CMake formatting

lowercase function names, blocks indent
This commit is contained in:
Louis Gombert 2024-04-20 14:35:20 +02:00
parent ad6c3ee5a9
commit c2b71b8147
57 changed files with 332 additions and 339 deletions

View File

@ -1,5 +1,5 @@
SET (HEADERS lib2d.h)
SET (CPPS
set(HEADERS lib2d.h)
set(CPPS
font.cpp
hardsurf.cpp
memsurf.cpp
@ -9,5 +9,5 @@ SET (CPPS
surface.cpp
viewport.cpp)
ADD_LIBRARY(2dlib STATIC ${HEADERS} ${CPPS})
add_library(2dlib STATIC ${HEADERS} ${CPPS})

View File

@ -1,6 +1,6 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
encoder.cpp)
ADD_LIBRARY(AudioEncode STATIC ${HEADERS} ${CPPS})
add_library(AudioEncode STATIC ${HEADERS} ${CPPS})
target_link_libraries(AudioEncode libacm)

View File

@ -1,66 +1,67 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.19)
cmake_minimum_required(VERSION 3.19)
# allow more human readable "if then else" constructs
SET( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
PROJECT(Descent3 VERSION 1.5.500)
project(Descent3 VERSION 1.5.500)
SET(CMAKE_CXX_STANDARD 17)
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
SET(CMAKE_CXX_EXTENSIONS OFF)
SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_CXX_EXTENSIONS OFF)
IF (UNIX)
IF (UNIX AND NOT APPLE)
SET(EXTRA_CXX_FLAGS "-fpermissive ")
ENDIF()
if (UNIX)
set(D3_GAMEDIR "~/Descent3/")
STRING(APPEND CMAKE_CXX_FLAGS " -Wno-write-strings -Wno-multichar -Wno-address-of-temporary ${BITS} ${EXTRA_CXX_FLAGS}")
STRING(APPEND CMAKE_C_FLAGS " ${BITS}")
if (UNIX AND NOT APPLE)
set(EXTRA_CXX_FLAGS "-fpermissive ")
endif()
FIND_PACKAGE(SDL REQUIRED)
IF (APPLE)
string(APPEND CMAKE_CXX_FLAGS " -Wno-write-strings -Wno-multichar -Wno-address-of-temporary ${BITS} ${EXTRA_CXX_FLAGS}")
string(APPEND CMAKE_C_FLAGS " ${BITS}")
find_package(SDL REQUIRED)
if (APPLE)
# Provide FIND_PACKAGE( SDL_image ) below with an include dir and library that work with brew-installed sdl2_image
FIND_PATH(SDL_IMAGE_INCLUDE_DIR SDL_image.h PATH_SUFFIXES include/SDL2)
FIND_LIBRARY(SDL_IMAGE_LIBRARY SDL2_image)
ENDIF()
FIND_PACKAGE(SDL_image REQUIRED)
FIND_PACKAGE(Curses REQUIRED)
FIND_PACKAGE(OpenGL REQUIRED)
MESSAGE( "SDL Include Dir is " ${SDL_INCLUDE_DIR} )
ENDIF()
find_path(SDL_IMAGE_INCLUDE_DIR SDL_image.h PATH_SUFFIXES include/SDL2)
find_library(SDL_IMAGE_LIBRARY SDL2_image)
endif()
find_package(SDL_image REQUIRED)
find_package(Curses REQUIRED)
find_package(OpenGL REQUIRED)
message( "SDL Include Dir is " ${SDL_INCLUDE_DIR} )
endif()
IF (UNIX AND NOT APPLE)
MESSAGE("Building for Linux")
if (UNIX AND NOT APPLE)
message("Building for Linux")
add_definitions( -D_DEBUG -D__LINUX__ -DLINUX -D_MAX_PATH=260 -D_MAX_FNAME=256 -D_REENRANT -D__32BIT__ -DHAVEALLOCA_H -D_USE_OGL_ACTIVE_TEXTURES)
set(PLATFORM_INCLUDES "lib/linux" ${SDL_INCLUDE_DIR} )
endif()
ADD_DEFINITIONS( -D_DEBUG -D__LINUX__ -DLINUX -D_MAX_PATH=260 -D_MAX_FNAME=256 -D_REENRANT -D__32BIT__ -DHAVEALLOCA_H -D_USE_OGL_ACTIVE_TEXTURES)
SET(PLATFORM_INCLUDES "lib/linux" ${SDL_INCLUDE_DIR} )
ENDIF()
if (APPLE)
message("Building for MAC OSX")
add_definitions(-D_DEBUG -D__LINUX__ -DLINUX -D_MAX_PATH=260 -D_MAX_FNAME=256 -D_REENRANT -DMACOSX=1 -D_USE_OGL_ACTIVE_TEXTURES)
set(PLATFORM_INCLUDES "lib/linux" ${SDL_INCLUDE_DIR} "/usr/X11/include" )
endif()
IF (APPLE)
MESSAGE("Building for MAC OSX")
ADD_DEFINITIONS(-D_DEBUG -D__LINUX__ -DLINUX -D_MAX_PATH=260 -D_MAX_FNAME=256 -D_REENRANT -DMACOSX=1 -D_USE_OGL_ACTIVE_TEXTURES)
SET(PLATFORM_INCLUDES "lib/linux" ${SDL_INCLUDE_DIR} "/usr/X11/include" )
ENDIF()
IF (WIN32)
set (CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "lib/win" "lib/win/directx")
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /EHsc /RTC1 /W3 /nologo /c /Zi /TP /errorReport:prompt")
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /FD /EHsc /W3 /nologo /c /Zi /TP /errorReport:prompt")
if (WIN32)
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "lib/win" "lib/win/directx")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /EHsc /RTC1 /W3 /nologo /c /Zi /TP /errorReport:prompt")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /FD /EHsc /W3 /nologo /c /Zi /TP /errorReport:prompt")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /SUBSYSTEM:WINDOWS /NODEFAULTLIB:LIBC")
SET(CMAKE_MODULE_LINKER_FLAGS "/SAFESEH:NO /SUBSYSTEM:WINDOWS /NODEFAULTLIB:LIBC")
ADD_DEFINITIONS (-DIS_WINDOWS -D_CRT_SECURE_NO_WARNINGS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /SUBSYSTEM:WINDOWS /NODEFAULTLIB:LIBC")
set(CMAKE_MODULE_LINKER_FLAGS "/SAFESEH:NO /SUBSYSTEM:WINDOWS /NODEFAULTLIB:LIBC")
add_definitions(-DIS_WINDOWS -D_CRT_SECURE_NO_WARNINGS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
SET(PLATFORM_INCLUDES "lib/win/directx" "lib/win")
set(PLATFORM_INCLUDES "lib/win/directx" "lib/win")
SET(CMAKE_FIND_LIBRARY_PREFIXES "")
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
set(CMAKE_FIND_LIBRARY_PREFIXES "")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
FIND_LIBRARY(DSOUND_LIBRARY NAMES dsound "${CMAKE_SOURCE_DIR}/lib/win" "${CMAKE_SOURCE_DIR}/lib/win/directx")
FIND_LIBRARY(DINPUT_LIBRARY NAMES dinput "${CMAKE_SOURCE_DIR}/lib/win" "${CMAKE_SOURCE_DIR}/lib/win/directx")
FIND_LIBRARY(DXGUID_LIBRARY NAMES dxguid "${CMAKE_SOURCE_DIR}/lib/win" "${CMAKE_SOURCE_DIR}/lib/win/directx")
FIND_LIBRARY(DDRAW_LIBRARY NAMES ddraw "${CMAKE_SOURCE_DIR}/lib/win" "${CMAKE_SOURCE_DIR}/lib/win/directx")
find_library(DSOUND_LIBRARY NAMES dsound "${CMAKE_SOURCE_DIR}/lib/win" "${CMAKE_SOURCE_DIR}/lib/win/directx")
find_library(DINPUT_LIBRARY NAMES dinput "${CMAKE_SOURCE_DIR}/lib/win" "${CMAKE_SOURCE_DIR}/lib/win/directx")
find_library(DXGUID_LIBRARY NAMES dxguid "${CMAKE_SOURCE_DIR}/lib/win" "${CMAKE_SOURCE_DIR}/lib/win/directx")
find_library(DDRAW_LIBRARY NAMES ddraw "${CMAKE_SOURCE_DIR}/lib/win" "${CMAKE_SOURCE_DIR}/lib/win/directx")
if (MSVC AND CMAKE_CXX_SIMULATE_ID STREQUAL "")
add_compile_options("/we4150") # deletion of pointer to incomplete type 'type'; no destructor called
@ -74,68 +75,68 @@ IF (WIN32)
add_compile_options("/we4715") # 'function' : not all control paths return a value
add_compile_options("/we4834") # discarding return value of function with [[nodiscard]] attribute
endif()
ENDIF ()
endif ()
include_directories("lib" "Descent3" ${PLATFORM_INCLUDES})
# file(GLOB_RECURSE INCS "*.h")
ADD_SUBDIRECTORY (2dlib)
ADD_SUBDIRECTORY (AudioEncode)
ADD_SUBDIRECTORY (bitmap)
ADD_SUBDIRECTORY (cfile)
ADD_SUBDIRECTORY (czip)
ADD_SUBDIRECTORY (d3music)
add_subdirectory(2dlib)
add_subdirectory(AudioEncode)
add_subdirectory(bitmap)
add_subdirectory(cfile)
add_subdirectory(czip)
add_subdirectory(d3music)
IF (WIN32)
ADD_SUBDIRECTORY (dd_grwin32)
ADD_SUBDIRECTORY (dd_vidwin32)
ADD_SUBDIRECTORY (ddio_win)
ADD_SUBDIRECTORY (win32)
ADD_SUBDIRECTORY (dd_sndlib)
ENDIF()
if (WIN32)
add_subdirectory(dd_grwin32)
add_subdirectory(dd_vidwin32)
add_subdirectory(win32)
add_subdirectory(dd_sndlib)
add_subdirectory(ddio_win)
endif()
IF (UNIX)
ADD_SUBDIRECTORY(linux)
ADD_SUBDIRECTORY(dd_lnxsound)
ADD_SUBDIRECTORY(ddvid_lnx)
ADD_SUBDIRECTORY(lnxcontroller)
ADD_SUBDIRECTORY(ddio_lnx)
ENDIF()
if (UNIX)
add_subdirectory(linux)
add_subdirectory(ddvid_lnx)
add_subdirectory(dd_lnxsound)
add_subdirectory(lnxcontroller)
add_subdirectory(ddio_lnx)
endif()
ADD_SUBDIRECTORY (ddio_common)
ADD_SUBDIRECTORY (fix)
ADD_SUBDIRECTORY (grtext)
ADD_SUBDIRECTORY (manage)
ADD_SUBDIRECTORY (mem)
ADD_SUBDIRECTORY (misc)
ADD_SUBDIRECTORY (model)
ADD_SUBDIRECTORY (module)
ADD_SUBDIRECTORY (movie)
ADD_SUBDIRECTORY (music)
ADD_SUBDIRECTORY (networking)
ADD_SUBDIRECTORY (physics)
ADD_SUBDIRECTORY (renderer)
ADD_SUBDIRECTORY (rtperformance)
ADD_SUBDIRECTORY (sndlib)
ADD_SUBDIRECTORY (stream_audio)
ADD_SUBDIRECTORY (ui)
ADD_SUBDIRECTORY (unzip)
ADD_SUBDIRECTORY (vecmat)
ADD_SUBDIRECTORY (libmve)
ADD_SUBDIRECTORY (md5)
ADD_SUBDIRECTORY (libacm)
ADD_SUBDIRECTORY (Descent3)
add_subdirectory(ddio_common)
add_subdirectory(fix)
add_subdirectory(manage)
add_subdirectory(grtext)
add_subdirectory(mem)
add_subdirectory(misc)
add_subdirectory(model)
add_subdirectory(module)
add_subdirectory(movie)
add_subdirectory(music)
add_subdirectory(networking)
add_subdirectory(physics)
add_subdirectory(renderer)
add_subdirectory(rtperformance)
add_subdirectory(sndlib)
add_subdirectory(stream_audio)
add_subdirectory(ui)
add_subdirectory(unzip)
add_subdirectory(vecmat)
add_subdirectory(libmve)
add_subdirectory(md5)
add_subdirectory(libacm)
add_subdirectory(Descent3)
# For now we don't need to build the scripts under windows, so we'll only include
# the directory when building for linux/osx. In the future we may want to to fix bugs, etc.
IF(UNIX)
ADD_SUBDIRECTORY (netgames)
ADD_SUBDIRECTORY (netcon)
ADD_SUBDIRECTORY (scripts)
ENDIF()
if(UNIX)
add_subdirectory(netgames)
add_subdirectory(netcon)
add_subdirectory(scripts)
endif()
# set default cmake build type to Debug (None Debug Release RelWithDebInfo MinSizeRel)
IF( NOT CMAKE_BUILD_TYPE )
SET( CMAKE_BUILD_TYPE "Debug" )
ENDIF()
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Debug")
endif()

View File

@ -1,4 +1,4 @@
SET (HEADERS
set(HEADERS
aiambient.h
AIGoal.h
AIMain.h
@ -143,7 +143,8 @@ SET (HEADERS
weapon.h
weapon_external.h
weather.h)
SET (CPPS
set (CPPS
aiambient.cpp
AIGoal.cpp
AImain.cpp
@ -276,28 +277,27 @@ SET (CPPS
)
IF (WIN32)
SET (PLATFORM_LIBS dd_sndlib dd_grwin32 dd_vidwin32 ddio_win win32 wsock32.lib winmm.lib Glu32.lib
${DSOUND_LIBRARY} ${DINPUT_LIBRARY} ${DXGUID_LIBRARY} ${DDRAW_LIBRARY})
SET (PLATFORM_CPPS winmain.cpp )
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /SUBSYSTEM:WINDOWS /NODEFAULTLIB:LIBC")
if (WIN32)
set (PLATFORM_LIBS dd_sndlib dd_grwin32 dd_vidwin32 ddio_win win32 wsock32.lib winmm.lib Glu32.lib
${DSOUND_LIBRARY} ${DINPUT_LIBRARY} ${DXGUID_LIBRARY} ${DDRAW_LIBRARY})
set(PLATFORM_CPPS winmain.cpp )
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO /SUBSYSTEM:WINDOWS /NODEFAULTLIB:LIBC")
endif()
ENDIF()
IF (UNIX AND NOT APPLE)
SET (PLATFORM_LIBS linux dd_lnxsound ddvid_lnx lnxcontroller ddio_lnx SDL::SDL m ${CMAKE_DL_LIBS} OpenGL::GLU ${CURSES_LIBRARIES})
SET (PLATFORM_CPPS loki_utils.c lnxmain.cpp)
ENDIF()
if (UNIX AND NOT APPLE)
set(PLATFORM_LIBS linux dd_lnxsound ddvid_lnx lnxcontroller ddio_lnx SDL::SDL m ${CMAKE_DL_LIBS} OpenGL::GLU ${CURSES_LIBRARIES})
set(PLATFORM_CPPS loki_utils.c lnxmain.cpp)
endif()
IF (APPLE)
SET (PLATFORM_LIBS linux dd_lnxsound ddvid_lnx lnxcontroller ddio_lnx SDL::SDL ${CURSES_LIBRARIES})
SET (PLATFORM_CPPS loki_utils.c lnxmain.cpp SDLMain.m)
SET(CMAKE_EXE_LINKER_FLAGS "-framework IOKit -framework Cocoa -framework OpenGL -framework Carbon")
ENDIF()
if (APPLE)
set (PLATFORM_LIBS linux dd_lnxsound ddvid_lnx lnxcontroller ddio_lnx SDL::SDL ${CURSES_LIBRARIES})
set (PLATFORM_CPPS loki_utils.c lnxmain.cpp SDLMain.m)
set(CMAKE_EXE_LINKER_FLAGS "-framework IOKit -framework Cocoa -framework OpenGL -framework Carbon")
endif()
file(GLOB_RECURSE INCS "../lib/*.h")
ADD_EXECUTABLE(Descent3 ${HEADERS} ${CPPS} ${PLATFORM_CPPS} ${INCS})
add_executable(Descent3 ${HEADERS} ${CPPS} ${PLATFORM_CPPS} ${INCS})
target_link_libraries(Descent3
2dlib AudioEncode bitmap cfile czip d3music ddio_common libmve libacm
fix grtext manage mem misc model module movie stream_audio

View File

@ -1,5 +1,5 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
acmlib.cpp)
ADD_LIBRARY(acmlib STATIC ${HEADERS} ${CPPS})
add_library(acmlib STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS iff.h)
SET (CPPS
set(HEADERS iff.h)
set(CPPS
bitmain.cpp
bumpmap.cpp
iff.cpp
@ -7,4 +7,4 @@ SET (CPPS
pcx.cpp
tga.cpp)
ADD_LIBRARY(bitmap STATIC ${HEADERS} ${CPPS})
add_library(bitmap STATIC ${HEADERS} ${CPPS})

View File

@ -1,7 +1,7 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
CFILE.cpp
hog.cpp
InfFile.cpp)
ADD_LIBRARY(cfile STATIC ${HEADERS} ${CPPS})
add_library(cfile STATIC ${HEADERS} ${CPPS})

View File

@ -1,8 +1,8 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
BitIO.cpp
CZip.cpp
HuffmanAdapt.cpp
HuffmanBasic.cpp)
ADD_LIBRARY(czip STATIC ${HEADERS} ${CPPS})
add_library(czip STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS )
SET (CPPS
set(HEADERS)
set(CPPS
musicapi.cpp)
ADD_LIBRARY(d3music STATIC ${HEADERS} ${CPPS})
add_library(d3music STATIC ${HEADERS} ${CPPS})

View File

@ -1,11 +1,11 @@
SET (HEADERS
set(HEADERS
ddgrWin32.h
ddgrWin32DX.h
ddgrWin32GDI.h)
SET (CPPS
set(CPPS
ddgrWin32API.cpp
ddgrWin32DX.cpp
ddgrWin32GDI.cpp
ddgrWin32Init.cpp)
ADD_LIBRARY(dd_grwin32 STATIC ${HEADERS} ${CPPS})
add_library(dd_grwin32 STATIC ${HEADERS} ${CPPS})

View File

@ -1,4 +1,4 @@
SET (HEADERS ddlnxsound.h )
SET (CPPS mixer.cpp sdlsound.cpp ../dd_sndlib/ssl_lib.cpp ../dd_sndlib/ddsoundload.cpp)
set(HEADERS ddlnxsound.h )
set(CPPS mixer.cpp sdlsound.cpp ../dd_sndlib/ssl_lib.cpp ../dd_sndlib/ddsoundload.cpp)
ADD_LIBRARY(dd_lnxsound STATIC ${HEADERS} ${CPPS})
add_library(dd_lnxsound STATIC ${HEADERS} ${CPPS})

View File

@ -1,4 +1,4 @@
SET (HEADERS
set(HEADERS
auddev.h
ds3dlib_internal.h
eax.h
@ -6,7 +6,7 @@ SET (HEADERS
ia3dapi.h
Ia3dutil.h
vmanpset.h)
SET (CPPS
set(CPPS
aureal3d.cpp
ddsoundload.cpp
Ds3dlib.cpp
@ -15,4 +15,4 @@ SET (CPPS
geometry.cpp
ssl_lib.cpp)
ADD_LIBRARY(dd_sndlib STATIC ${HEADERS} ${CPPS})
add_library(dd_sndlib STATIC ${HEADERS} ${CPPS})

View File

@ -1,8 +1,8 @@
SET (HEADERS
set(HEADERS
ddvidlib.h)
SET (CPPS
set(CPPS
video_win32.cpp
vidWin32FS.cpp
vidWin32Win.cpp)
ADD_LIBRARY(dd_vidwin32 STATIC ${HEADERS} ${CPPS})
add_library(dd_vidwin32 STATIC ${HEADERS} ${CPPS})

View File

@ -1,6 +1,5 @@
SET (HEADERS )
SET (CPPS
set(HEADERS)
set(CPPS
ddio.cpp
key.cpp)
ADD_LIBRARY(ddio_common STATIC ${HEADERS} ${CPPS})
add_library(ddio_common STATIC ${HEADERS} ${CPPS})

View File

@ -1,4 +1,4 @@
SET (HEADERS ddio_lnx.h )
SET (CPPS lnxfile.cpp lnxforcefeedback.cpp lnxio.cpp sdljoy.cpp lnxkey.cpp lnxkey_null.cpp lnxmouse.cpp lnxtimer.cpp lnxkey_raw.cpp lnxcdrom.cpp lnxkey_sdl.cpp)
set(HEADERS ddio_lnx.h)
set(CPPS lnxfile.cpp lnxforcefeedback.cpp lnxio.cpp sdljoy.cpp lnxkey.cpp lnxkey_null.cpp lnxmouse.cpp lnxtimer.cpp lnxkey_raw.cpp lnxcdrom.cpp lnxkey_sdl.cpp)
ADD_LIBRARY(ddio_lnx STATIC ${HEADERS} ${CPPS})
add_library(ddio_lnx STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS ddio_win.h )
SET (CPPS
set(HEADERS ddio_win.h )
set(CPPS
serial.cpp
winfile.cpp
winforcefeedback.cpp
@ -9,4 +9,4 @@ SET (CPPS
winmouse.cpp
wintimer.cpp)
ADD_LIBRARY(ddio_win STATIC ${HEADERS} ${CPPS})
add_library(ddio_win STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS )
SET (CPPS
set(HEADERS)
set(CPPS
video_lnx.cpp)
ADD_LIBRARY(ddvid_lnx STATIC ${HEADERS} ${CPPS})
add_library(ddvid_lnx STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS )
SET (CPPS
set (HEADERS )
set (CPPS
fix.cpp)
ADD_LIBRARY(fix STATIC ${HEADERS} ${CPPS})
add_library(fix STATIC ${HEADERS} ${CPPS})

View File

@ -1,7 +1,7 @@
SET (HEADERS grtextlib.h )
SET (CPPS
set(HEADERS grtextlib.h )
set(CPPS
grfont.cpp
grtext.cpp
textaux.cpp)
ADD_LIBRARY(grtext STATIC ${HEADERS} ${CPPS})
add_library(grtext STATIC ${HEADERS} ${CPPS})

View File

@ -1,6 +1,6 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
aencode.cpp
libacm.cpp)
ADD_LIBRARY(libacm STATIC ${HEADERS} ${CPPS})
add_library(libacm STATIC ${HEADERS} ${CPPS})

View File

@ -1,21 +1,19 @@
SET (HEADERS mvegfx.h
set(HEADERS mvegfx.h
mvelibi.h
mvelibl.h
platform.h
snd8to16.h
SystemInterfaces.h )
SET (CPPS
set(CPPS
mveasm.cpp
mvelibl.cpp
platform.cpp)
set(PLATFORM_CPPS )
if (UNIX)
set (PLATFORM_CPPS "lnxdsound.cpp")
endif()
SET (PLATFORM_CPPS )
IF (UNIX)
SET (PLATFORM_CPPS "lnxdsound.cpp")
ENDIF()
ADD_LIBRARY(libmve STATIC ${HEADERS} ${CPPS} ${PLATFORM_CPPS})
add_library(libmve STATIC ${HEADERS} ${CPPS} ${PLATFORM_CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS registry.h )
SET (CPPS
set(HEADERS registry.h )
set(CPPS
lnxcon.cpp
lnxcon_raw.cpp
lnxdebug.cpp
@ -9,4 +9,4 @@ SET (CPPS
lnxmono.cpp
registry.cpp)
# DynXLib.cpp
ADD_LIBRARY(linux STATIC ${HEADERS} ${CPPS})
add_library(linux STATIC ${HEADERS} ${CPPS})

View File

@ -1,6 +1,6 @@
SET (HEADERS )
SET (CPPS
set (HEADERS )
set (CPPS
lnxcontroller.cpp
)
ADD_LIBRARY(lnxcontroller STATIC ${HEADERS} ${CPPS})
add_library(lnxcontroller STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS dyna_pthread.h dyna_xext.h dyna_xwin.h lnxdsound.h mvegfx.h mvelibi.h mvelibl.h snd8to16.h )
SET (CPPS
set(HEADERS dyna_pthread.h dyna_xext.h dyna_xwin.h lnxdsound.h mvegfx.h mvelibi.h mvelibl.h snd8to16.h )
set(CPPS
lnxdraw.cpp
lnxdsound.cpp
mveasm.cpp
@ -7,4 +7,4 @@ SET (CPPS
# asmstub.c
ADD_LIBRARY(lnxmvelib STATIC ${HEADERS} ${CPPS})
add_library(lnxmvelib STATIC ${HEADERS} ${CPPS})

View File

@ -1,4 +1,4 @@
SET (HEADERS doorpage.h
set(HEADERS doorpage.h
gamefilepage.h
genericpage.h
megapage.h
@ -8,7 +8,7 @@ SET (HEADERS doorpage.h
soundpage.h
texpage.h
weaponpage.h )
SET (CPPS
set(CPPS
doorpage.cpp
gamefilepage.cpp
generic.cpp
@ -20,4 +20,4 @@ SET (CPPS
texpage.cpp
weaponpage.cpp)
ADD_LIBRARY(manage STATIC ${HEADERS} ${CPPS})
add_library(manage STATIC ${HEADERS} ${CPPS})

View File

@ -1,8 +1,7 @@
SET (HEADERS md5.h)
SET (CPPS
set(HEADERS md5.h)
set(CPPS
md5.cpp)
SET (PLATFORMCPPS )
set(PLATFORMCPPS )
ADD_LIBRARY(md5 STATIC ${HEADERS} ${CPPS} ${PLATFORMCPPS})
add_library(md5 STATIC ${HEADERS} ${CPPS} ${PLATFORMCPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
mem.cpp)
ADD_LIBRARY(mem STATIC ${HEADERS} ${CPPS})
add_library(mem STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
endian.cpp
error.cpp
logfile.cpp
@ -7,4 +7,4 @@ SET (CPPS
psrand.cpp
pstring.cpp)
ADD_LIBRARY(misc STATIC ${HEADERS} ${CPPS})
add_library(misc STATIC ${HEADERS} ${CPPS})

View File

@ -1,6 +1,6 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
newstyle.cpp
polymodel.cpp)
ADD_LIBRARY(model STATIC ${HEADERS} ${CPPS})
add_library(model STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
module.cpp)
ADD_LIBRARY(module STATIC ${HEADERS} ${CPPS})
add_library(module STATIC ${HEADERS} ${CPPS})

View File

@ -1,6 +1,6 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
d3movie.cpp)
ADD_LIBRARY(movie STATIC ${HEADERS} ${CPPS})
add_library(movie STATIC ${HEADERS} ${CPPS})
target_link_libraries(movie libmve)

View File

@ -1,8 +1,8 @@
SET (HEADERS )
SET (CPPS
set(HEADERS)
set(CPPS
omflex.cpp
sequencer.cpp
streamer.cpp
tracklist.cpp)
ADD_LIBRARY(music STATIC ${HEADERS} ${CPPS})
add_library(music STATIC ${HEADERS} ${CPPS})

View File

@ -1,3 +1,3 @@
include_directories("includes")
ADD_SUBDIRECTORY(inetfile)
ADD_SUBDIRECTORY(lanclient)
add_subdirectory(inetfile)
add_subdirectory(lanclient)

View File

@ -1,9 +1,9 @@
SET (HEADERS )
set(HEADERS)
SET (CPPS
set(CPPS
CFtp.cpp
Chttpget.cpp
inetgetfile.cpp
)
ADD_LIBRARY(inetfile STATIC ${HEADERS} ${CPPS})
add_library(inetfile STATIC ${HEADERS} ${CPPS})

View File

@ -1,9 +1,9 @@
SET (HEADERS lanclient.h)
SET (CPPS lanclient.cpp)
set(HEADERS lanclient.h)
set(CPPS lanclient.cpp)
SET (NETGAME_MODULE "TCP_IP")
set(NETGAME_MODULE "TCP_IP")
ADD_LIBRARY(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3c")
target_link_libraries(${NETGAME_MODULE} inetfile)

View File

@ -1,11 +1,11 @@
include_directories("includes")
ADD_SUBDIRECTORY(dmfc)
ADD_SUBDIRECTORY(anarchy)
ADD_SUBDIRECTORY(coop)
ADD_SUBDIRECTORY(ctf)
ADD_SUBDIRECTORY(entropy)
ADD_SUBDIRECTORY(hoard)
ADD_SUBDIRECTORY(hyperanarchy)
ADD_SUBDIRECTORY(monsterball)
ADD_SUBDIRECTORY(roboanarchy)
ADD_SUBDIRECTORY(tanarchy)
add_subdirectory(dmfc)
add_subdirectory(anarchy)
add_subdirectory(coop)
add_subdirectory(ctf)
add_subdirectory(entropy)
add_subdirectory(hoard)
add_subdirectory(hyperanarchy)
add_subdirectory(monsterball)
add_subdirectory(roboanarchy)
add_subdirectory(tanarchy)

View File

@ -1,9 +1,9 @@
SET (HEADERS anarchystr.h Anarchy.h)
SET (CPPS anarchy.cpp)
set(HEADERS anarchystr.h Anarchy.h)
set(CPPS anarchy.cpp)
SET (NETGAME_MODULE anarchy)
set(NETGAME_MODULE anarchy)
ADD_LIBRARY(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")

View File

@ -1,9 +1,9 @@
SET (HEADERS coop.h)
SET (CPPS coop.cpp)
set(HEADERS coop.h)
set(CPPS coop.cpp)
SET (NETGAME_MODULE coop)
set(NETGAME_MODULE coop)
ADD_LIBRARY(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")

View File

@ -1,9 +1,9 @@
SET (HEADERS ctf.h CTFstr.h)
SET (CPPS ctf.cpp)
set(HEADERS ctf.h CTFstr.h)
set(CPPS ctf.cpp)
SET (NETGAME_MODULE ctf)
set(NETGAME_MODULE ctf)
ADD_LIBRARY(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")

View File

@ -1,10 +1,10 @@
SET (HEADERS dmfcdllinit.h
set(HEADERS dmfcdllinit.h
dmfcinputcommands.h
dmfcinternal.h
encryption.h
)
SET (CPPS
set(CPPS
dmfcbase.cpp
dmfccfg.cpp
dmfcclient.cpp
@ -25,6 +25,6 @@ SET (CPPS
encryption.cpp
dmfcinterface.cpp)
ADD_DEFINITIONS(-DOUTRAGE_VERSION -DDMFC_DLL)
add_definitions(-DOUTRAGE_VERSION -DDMFC_DLL)
ADD_LIBRARY(dmfc STATIC ${HEADERS} ${CPPS})
add_library(dmfc STATIC ${HEADERS} ${CPPS})

View File

@ -1,9 +1,9 @@
SET (HEADERS Entropy.h Entropystr.h EntropyAux.h)
SET (CPPS EntropyBase.cpp EntropyPackets.cpp EntropyRoom.cpp)
set(HEADERS Entropy.h Entropystr.h EntropyAux.h)
set(CPPS EntropyBase.cpp EntropyPackets.cpp EntropyRoom.cpp)
SET (NETGAME_MODULE entropy)
set(NETGAME_MODULE entropy)
ADD_LIBRARY(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")

View File

@ -1,9 +1,9 @@
SET (HEADERS hoardaux.h Hoard.h hoardstr.h)
SET (CPPS hoard.cpp hoard_ui.cpp )
set(HEADERS hoardaux.h Hoard.h hoardstr.h)
set(CPPS hoard.cpp hoard_ui.cpp)
SET (NETGAME_MODULE hoard)
set (NETGAME_MODULE hoard)
ADD_LIBRARY(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")

View File

@ -1,9 +1,9 @@
SET (HEADERS HyperAnarchy.h hyperstr.h)
SET (CPPS hyperanarchy.cpp)
set(HEADERS HyperAnarchy.h hyperstr.h)
set(CPPS hyperanarchy.cpp)
SET (NETGAME_MODULE hyperanarchy)
set(NETGAME_MODULE hyperanarchy)
ADD_LIBRARY(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")

View File

@ -1,9 +1,9 @@
SET (HEADERS monsterball.h monsterstr.h)
SET (CPPS monsterball.cpp)
set(HEADERS monsterball.h monsterstr.h)
set(CPPS monsterball.cpp)
SET (NETGAME_MODULE monsterball)
set(NETGAME_MODULE monsterball)
ADD_LIBRARY(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")

View File

@ -1,9 +1,9 @@
SET (HEADERS roboAnarchy.h roboanarchystr.h)
SET (CPPS roboanarchy.cpp)
set(HEADERS roboAnarchy.h roboanarchystr.h)
set(CPPS roboanarchy.cpp)
SET (NETGAME_MODULE roboanarchy)
set(NETGAME_MODULE roboanarchy)
ADD_LIBRARY(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")

View File

@ -1,9 +1,9 @@
SET (HEADERS tanarchystr.h tanDMFC.h)
SET (CPPS tanarchy.cpp)
set(HEADERS tanarchystr.h tanDMFC.h)
set(CPPS tanarchy.cpp)
SET (NETGAME_MODULE tanarchy)
set(NETGAME_MODULE tanarchy)
ADD_LIBRARY(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
add_library(${NETGAME_MODULE} SHARED ${CPPS} ${HEADERS})
set_target_properties(${NETGAME_MODULE} PROPERTIES PREFIX "")
set_target_properties(${NETGAME_MODULE} PROPERTIES SUFFIX ".d3m")

View File

@ -1,11 +1,11 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
networking.cpp)
SET (PLATFORMCPPS )
set(PLATFORMCPPS)
IF(WIN32)
SET (PLATFORMCPPS "directplay.cpp")
ENDIF()
if(WIN32)
set(PLATFORMCPPS "directplay.cpp")
endif()
ADD_LIBRARY(networking STATIC ${HEADERS} ${CPPS} ${PLATFORMCPPS})
add_library(networking STATIC ${HEADERS} ${CPPS} ${PLATFORMCPPS})

View File

@ -1,8 +1,8 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
Collide.cpp
FindIntersection.cpp
newstyle_fi.cpp
physics.cpp)
ADD_LIBRARY(physics STATIC ${HEADERS} ${CPPS})
add_library(physics STATIC ${HEADERS} ${CPPS})

View File

@ -1,9 +1,9 @@
SET (HEADERS
set(HEADERS
dyna_gl.h
HardwareInternal.h
RendererConfig.h
SoftwareInternal.h)
SET (CPPS
set(CPPS
HardwareClipper.cpp
HardwareDraw.cpp
HardwareGlobalVars.cpp
@ -22,15 +22,13 @@ SET (CPPS
SoftwarePoints.cpp
SoftwareSetup.cpp)
IF(UNIX)
SET (CPPS ${CPPS} lnxscreenmode.cpp)
ENDIF()
if(UNIX)
set (CPPS ${CPPS} lnxscreenmode.cpp)
endif()
# These are excluded.
#opengl.cpp
#renderer.cpp
#Direct3D.cpp
ADD_LIBRARY(renderer STATIC ${HEADERS} ${CPPS})
add_library(renderer STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS )
SET (CPPS
set(HEADERS)
set(CPPS
rtperformance.cpp)
ADD_LIBRARY(rtperformance STATIC ${HEADERS} ${CPPS})
add_library(rtperformance STATIC ${HEADERS} ${CPPS})

View File

@ -1,13 +1,13 @@
ADD_DEFINITIONS (-DCHECKSUM=2273873307UL)
SET (HEADERS )
SET (CPPS )
IF(UNIX)
SET (CPPS
linux_lib.cpp)
ENDIF()
add_definitions (-DCHECKSUM=2273873307UL)
set(HEADERS)
set(CPPS)
if(UNIX)
set (CPPS
linux_lib.cpp)
endif()
SET (SCRIPTS
set(SCRIPTS
aigame2
AIGame3
aigame4
@ -65,31 +65,29 @@ SET (SCRIPTS
TrainingMission
Y2K)
FOREACH(SCRIPT ${SCRIPTS})
ADD_LIBRARY(${SCRIPT} SHARED ${CPPS} "${SCRIPT}.cpp")
foreach(SCRIPT ${SCRIPTS})
add_library(${SCRIPT} SHARED ${CPPS} "${SCRIPT}.cpp")
set_target_properties(${SCRIPT} PROPERTIES PREFIX "")
IF(UNIX)
ADD_CUSTOM_COMMAND(
if(UNIX)
add_custom_command(
TARGET ${SCRIPT}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${SCRIPT}> "${CMAKE_SOURCE_DIR}/scripts/data/linuxfullhog/"
COMMENT "Copying file ${SCRIPT} to hogfile directory..."
)
ADD_CUSTOM_COMMAND(
add_custom_command(
TARGET ${SCRIPT}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${SCRIPT}> "${CMAKE_SOURCE_DIR}/scripts/data/linuxdemohog/"
)
ENDIF()
ENDFOREACH()
endif()
endforeach()
IF(UNIX AND NOT APPLE)
SET(HOGBUILDCMD "${CMAKE_SOURCE_DIR}/scripts/hogutils/hogUtils-i686")
SET(HOGARCH "linux")
if(UNIX AND NOT APPLE)
set(HOGBUILDCMD "${CMAKE_SOURCE_DIR}/scripts/hogutils/hogUtils-i686")
set(HOGARCH "linux")
ADD_CUSTOM_TARGET("FullLinuxHog"
add_custom_target("FullLinuxHog"
ALL
COMMAND ${HOGBUILDCMD} "--makehog" "d3linuxfullhog.txt"
COMMAND ${CMAKE_COMMAND} -E remove "${CMAKE_SOURCE_DIR}/scripts/data/linuxfullhog/d3-${HOGARCH}.hog"
@ -100,7 +98,7 @@ IF(UNIX AND NOT APPLE)
DEPENDS ${SCRIPTS}
COMMENT "Building platform specific hog."
)
ADD_CUSTOM_TARGET("DemoLinuxHog"
add_custom_target("DemoLinuxHog"
ALL
COMMAND ${HOGBUILDCMD} "--makehog" "d3linuxdemohog.txt"
COMMAND ${CMAKE_COMMAND} -E remove "${CMAKE_SOURCE_DIR}/scripts/data/linuxdemohog/d3-${HOGARCH}.hog"
@ -110,4 +108,4 @@ IF(UNIX AND NOT APPLE)
DEPENDS ${SCRIPTS}
COMMENT "Building platform specific hog."
)
ENDIF()
endif()

View File

@ -1,7 +1,7 @@
SET (HEADERS sndrender.h )
SET (CPPS
set(HEADERS sndrender.h )
set(CPPS
hlsoundlib.cpp
sndrender.cpp
soundload.cpp)
ADD_LIBRARY(sndlib STATIC ${HEADERS} ${CPPS})
add_library(sndlib STATIC ${HEADERS} ${CPPS})

View File

@ -1,7 +1,7 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
osfarchive.cpp
streamaudio.cpp)
ADD_LIBRARY(stream_audio STATIC ${HEADERS} ${CPPS})
add_library(stream_audio STATIC ${HEADERS} ${CPPS})
target_link_libraries(stream_audio libacm)

View File

@ -1,5 +1,5 @@
SET (HEADERS UIlib.h )
SET (CPPS
set(HEADERS UIlib.h)
set(CPPS
UIButton.cpp
UICombo.cpp
UIConsole.cpp
@ -16,4 +16,4 @@ SET (CPPS
UISystem.cpp
UIWindow.cpp)
ADD_LIBRARY(ui STATIC ${HEADERS} ${CPPS})
add_library(ui STATIC ${HEADERS} ${CPPS})

View File

@ -1,4 +1,4 @@
SET (HEADERS infblock.h
set(HEADERS infblock.h
infcodes.h
inffast.h
inffixed.h
@ -7,7 +7,7 @@ SET (HEADERS infblock.h
zconf.h
zlib.h
zutil.h )
SET (CPPS
set(CPPS
unzip.cpp
adler32.c
infblock.c
@ -18,4 +18,4 @@ SET (CPPS
infutil.c
)
ADD_LIBRARY(unzip STATIC ${HEADERS} ${CPPS})
add_library(unzip STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS )
SET (CPPS
set(HEADERS )
set(CPPS
vector.cpp)
ADD_LIBRARY(vecmat STATIC ${HEADERS} ${CPPS})
add_library(vecmat STATIC ${HEADERS} ${CPPS})

View File

@ -1,5 +1,5 @@
SET (HEADERS win32os.h )
SET (CPPS
set(HEADERS win32os.h )
set(CPPS
winapp.cpp
wincon.cpp
WinController.cpp
@ -8,4 +8,4 @@ SET (CPPS
winmono.cpp
wintask.cpp)
ADD_LIBRARY(win32 STATIC ${HEADERS} ${CPPS})
add_library(win32 STATIC ${HEADERS} ${CPPS})