…rge.

.gitignore

@@ -13,6 +13,7 @@ objwin/
cataclysm.exe
version.h
Cataclysm.exe
CataclysmWin.cscope_file_list
CataclysmWin.depend
CataclysmWin.layout
*.dll

CMakeLists.txt

@@ -23,6 +23,7 @@ PROJECT(CataclysmDDA)

OPTION(LOCALIZE "Toggle gettext localization/translation." ON)
OPTION(SDL "Use SDL curses emulation instead of terminal support." OFF)
OPTION(TILES "Enable tileset support." OFF)

# Note: The CMake documentation says it's better to list the actual source
#       files here, as otherwise cmake won't know to rerun when a new file
@@ -54,7 +55,7 @@ ENDIF()

# TODO: windows rc stuff

IF(SDL)
IF(SDL OR TILES)
    # CMake ships with a few helpful include's to find common libraries
    # like SDL
    Include(FindSDL)
@@ -64,7 +65,21 @@ IF(SDL)
    Find_Package(SDL_ttf REQUIRED)

    TARGET_LINK_LIBRARIES(cataclysm ${SDL_LIBRARY} ${SDLTTF_LIBRARY})
    add_definitions(-DTILES)

    IF(TILES)
        # Install GFX directory
        ADD_CUSTOM_COMMAND(
            TARGET cataclysm PRE_BUILD 
            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/gfx $<TARGET_FILE_DIR:cataclysm>/gfx
        )

        Include(FindSDL_image)
        TARGET_LINK_LIBRARIES(cataclysm ${SDLIMAGE_LIBRARY})
        ADD_DEFINITIONS(-DSDLTILES)
    ELSE()
        ADD_DEFINITIONS(-DTILES)
    ENDIF()

ELSEIF(MSVC OR MINGW)
    # On windows our default isn't curses, but rather GDI
    TARGET_LINK_LIBRARIES(cataclysm gdi32 intl iconv winmm)

CataclysmWin.cbp

@@ -64,17 +64,45 @@
					<Add library="iconv" />
				</Linker>
			</Target>
			<Target title="Release - Tile Support">
				<Option output="Cataclysm-Tiles" prefix_auto="1" extension_auto="1" />
				<Option object_output="obj/TilesRelease/" />
				<Option type="0" />
				<Option compiler="gcc" />
				<Compiler>
					<Add option="-Os" />
					<Add option="-O2" />
					<Add option="-pg" />
					<Add option="-DSDLTILES" />
					<Add directory="3rdparty/include/SDL" />
				</Compiler>
				<Linker>
					<Add option="-pg -lgmon" />
					<Add library="3rdparty\lib\libSDL.dll.a" />
					<Add library="3rdparty\lib\libSDLmain.a" />
					<Add library="3rdparty\lib\x86\SDL_image.lib" />
					<Add library="3rdparty\lib\x86\SDL_ttf.lib" />
					<Add directory="3rdparty/lib" />
					<Add directory="3rdparty/lib/x86" />
				</Linker>
			</Target>
		</Build>
		<Linker>
			<Add option="-Wl,-stack,12000000,-subsystem,windows" />
			<Add option="-static" />
			<Add library="gdi32" />
			<Add library="winmm" />
		</Linker>
		<Unit filename="SDLMain.h" />
		<Unit filename="action.cpp" />
		<Unit filename="action.h" />
		<Unit filename="addiction.cpp" />
		<Unit filename="addiction.h" />
		<Unit filename="advanced_inv.cpp" />
		<Unit filename="advanced_inv.h" />
		<Unit filename="animation.h" />
		<Unit filename="animation_curses.cpp" />
		<Unit filename="animation_tiles.cpp" />
		<Unit filename="artifact.cpp" />
		<Unit filename="artifact.h" />
		<Unit filename="artifactdata.h" />
@@ -90,7 +118,10 @@
		<Unit filename="building_generation.h" />
		<Unit filename="calendar.cpp" />
		<Unit filename="calendar.h" />
		<Unit filename="cata_tiles.cpp" />
		<Unit filename="cata_tiles.h" />
		<Unit filename="catacharset.cpp" />
		<Unit filename="catacharset.h" />
		<Unit filename="catacurse.h" />
		<Unit filename="catajson.cpp" />
		<Unit filename="catajson.h" />
@@ -110,14 +141,15 @@
		<Unit filename="dialogue.h" />
		<Unit filename="disease.cpp" />
		<Unit filename="disease.h" />
		<Unit filename="enums.h" />
		<Unit filename="editmap.cpp" />
		<Unit filename="editmap.h" />
		<Unit filename="enums.h" />
		<Unit filename="event.cpp" />
		<Unit filename="event.h" />
		<Unit filename="faction.cpp" />
		<Unit filename="faction.h" />
		<Unit filename="field.cpp" />
		<Unit filename="field.h" />
		<Unit filename="game.cpp" />
		<Unit filename="game.h" />
		<Unit filename="gamemode.cpp" />
@@ -221,6 +253,7 @@
		<Unit filename="rng.cpp" />
		<Unit filename="rng.h" />
		<Unit filename="sdlcurse.cpp" />
		<Unit filename="sdltiles.cpp" />
		<Unit filename="settlement.cpp" />
		<Unit filename="settlement.h" />
		<Unit filename="setvector.cpp" />
@@ -229,6 +262,7 @@
		<Unit filename="skill.h" />
		<Unit filename="text_snippets.cpp" />
		<Unit filename="text_snippets.h" />
		<Unit filename="tile_id_data.h" />
		<Unit filename="tileray.cpp" />
		<Unit filename="tileray.h" />
		<Unit filename="translations.h" />
@@ -239,14 +273,18 @@
		<Unit filename="tutorial.h" />
		<Unit filename="ui.cpp" />
		<Unit filename="ui.h" />
		<Unit filename="uistate.h" />
		<Unit filename="veh_interact.cpp" />
		<Unit filename="veh_interact.h" />
		<Unit filename="veh_type.h" />
		<Unit filename="veh_typedef.cpp" />
		<Unit filename="vehicle.cpp" />
		<Unit filename="vehicle.h" />
		<Unit filename="version.cpp" />
		<Unit filename="version.h" />
		<Unit filename="wcwidth.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="wdirent.h" />
		<Unit filename="weather.cpp" />
		<Unit filename="weather.h" />
		<Unit filename="weather_data.cpp" />

Makefile

@@ -159,6 +159,10 @@ ifeq ($(TARGETSYSTEM),WINDOWS)
endif

ifdef TILES
  SDL = 1
endif

ifdef SDL
  ifeq ($(NATIVE),osx)
    ifdef FRAMEWORK
      DEFINES += -DOSX_SDL_FW
@@ -180,7 +184,12 @@ ifdef TILES
  else
    LDFLAGS += -lSDL -lSDL_ttf -lfreetype -lz
  endif
  DEFINES += -DTILES
  ifdef TILES
    LDFLAGS += -lSDL_image
    DEFINES += -DSDLTILES
  else
    DEFINES += -DTILES
  endif
  ifeq ($(TARGETSYSTEM),WINDOWS)
    LDFLAGS += -lgdi32 -ldxguid -lwinmm
    TARGET = $(W32TILESTARGET)