forked from Mirrors/openclonk
Reorder engine source file organization a bit
This mostly consists of flattening the hierarchy, splitting the graphics stuff out of platform, and a few smaller cleanups.rope
Günther Brammer
parent
4a56f8d7c1
commit
1a29f8625d
301
CMakeLists.txt
301
CMakeLists.txt
|
|
@ -152,15 +152,7 @@ endif()
|
|||
# OC_SYSTEM_SOURCES: Sources for OpenClonk that are only needed by specific
|
||||
# configurations.
|
||||
set(OC_CLONK_SOURCES
|
||||
src/C4Application.cpp
|
||||
src/C4Application.h
|
||||
src/C4FullScreen.cpp
|
||||
src/C4FullScreen.h
|
||||
src/C4Game.cpp
|
||||
src/C4Game.h
|
||||
src/C4Globals.cpp
|
||||
src/C4GraphicsSystem.cpp
|
||||
src/C4GraphicsSystem.h
|
||||
src/c4group/C4ComponentHost.cpp
|
||||
src/c4group/C4ComponentHost.h
|
||||
src/c4group/C4Components.h
|
||||
|
|
@ -186,8 +178,6 @@ set(OC_CLONK_SOURCES
|
|||
src/config/C4Constants.h
|
||||
src/config/C4Reloc.cpp
|
||||
src/config/C4Reloc.h
|
||||
src/config/C4SecurityCertificates.cpp
|
||||
src/config/C4SecurityCertificates.h
|
||||
src/control/C4Control.cpp
|
||||
src/control/C4Control.h
|
||||
src/control/C4GameControl.cpp
|
||||
|
|
@ -211,102 +201,62 @@ set(OC_CLONK_SOURCES
|
|||
src/editor/C4ConsoleGUICommon.h
|
||||
src/editor/C4ConsoleGUI.h
|
||||
src/editor/C4Console.h
|
||||
src/editor/C4DevmodeDlg.cpp
|
||||
src/editor/C4DevmodeDlg.h
|
||||
src/editor/C4EditCursor.cpp
|
||||
src/editor/C4EditCursor.h
|
||||
src/editor/C4ObjectListDlg.cpp
|
||||
src/editor/C4ObjectListDlg.h
|
||||
src/editor/C4ToolsDlg.cpp
|
||||
src/editor/C4ToolsDlg.h
|
||||
src/editor/C4ViewportWindow.cpp
|
||||
src/editor/C4ViewportWindow.h
|
||||
src/game/C4Application.cpp
|
||||
src/game/C4Application.h
|
||||
src/game/C4FullScreen.cpp
|
||||
src/game/C4FullScreen.h
|
||||
src/game/C4Game.cpp
|
||||
src/game/C4Game.h
|
||||
src/game/C4GameVersion.h
|
||||
src/game/C4GraphicsSystem.cpp
|
||||
src/game/C4GraphicsSystem.h
|
||||
src/game/C4Physics.h
|
||||
src/game/landscape/C4Landscape.cpp
|
||||
src/game/landscape/C4Landscape.h
|
||||
src/game/landscape/C4LandscapeRenderClassic.cpp
|
||||
src/game/landscape/C4LandscapeRender.cpp
|
||||
src/game/landscape/C4LandscapeRender.h
|
||||
src/game/landscape/C4Map.cpp
|
||||
src/game/landscape/C4MapCreatorS2.cpp
|
||||
src/game/landscape/C4MapCreatorS2.h
|
||||
src/game/landscape/C4Map.h
|
||||
src/game/landscape/C4MassMover.cpp
|
||||
src/game/landscape/C4MassMover.h
|
||||
src/game/landscape/C4Material.cpp
|
||||
src/game/landscape/C4Material.h
|
||||
src/game/landscape/C4MaterialList.cpp
|
||||
src/game/landscape/C4MaterialList.h
|
||||
src/game/landscape/C4Particles.cpp
|
||||
src/game/landscape/C4Particles.h
|
||||
src/game/landscape/C4PathFinder.cpp
|
||||
src/game/landscape/C4PathFinder.h
|
||||
src/game/landscape/C4PXS.cpp
|
||||
src/game/landscape/C4PXS.h
|
||||
src/game/landscape/C4Region.cpp
|
||||
src/game/landscape/C4Region.h
|
||||
src/game/landscape/C4Scenario.cpp
|
||||
src/game/landscape/C4Scenario.h
|
||||
src/game/landscape/C4Sky.cpp
|
||||
src/game/landscape/C4Sky.h
|
||||
src/game/landscape/C4SolidMask.cpp
|
||||
src/game/landscape/C4SolidMask.h
|
||||
src/game/landscape/C4Texture.cpp
|
||||
src/game/landscape/C4Texture.h
|
||||
src/game/landscape/C4Weather.cpp
|
||||
src/game/landscape/C4Weather.h
|
||||
src/game/object/C4Action.cpp
|
||||
src/game/object/C4Command.cpp
|
||||
src/game/object/C4Command.h
|
||||
src/game/object/C4Def.cpp
|
||||
src/game/object/C4DefGraphics.cpp
|
||||
src/game/object/C4DefGraphics.h
|
||||
src/game/object/C4Def.h
|
||||
src/game/object/C4DefList.cpp
|
||||
src/game/object/C4DefList.h
|
||||
src/game/object/C4GameObjects.cpp
|
||||
src/game/object/C4GameObjects.h
|
||||
src/game/object/C4Id.cpp
|
||||
src/game/object/C4Id.h
|
||||
src/game/object/C4IDList.cpp
|
||||
src/game/object/C4IDList.h
|
||||
src/game/object/C4InfoCore.cpp
|
||||
src/game/object/C4InfoCore.h
|
||||
src/game/object/C4MeshAnimation.cpp
|
||||
src/game/object/C4MeshAnimation.h
|
||||
src/game/object/C4Movement.cpp
|
||||
src/game/object/C4ObjectCom.cpp
|
||||
src/game/object/C4ObjectCom.h
|
||||
src/game/object/C4Object.cpp
|
||||
src/game/object/C4Object.h
|
||||
src/game/object/C4ObjectInfo.cpp
|
||||
src/game/object/C4ObjectInfo.h
|
||||
src/game/object/C4ObjectInfoList.cpp
|
||||
src/game/object/C4ObjectInfoList.h
|
||||
src/game/object/C4ObjectList.cpp
|
||||
src/game/object/C4ObjectList.h
|
||||
src/game/object/C4ObjectMenu.cpp
|
||||
src/game/object/C4ObjectMenu.h
|
||||
src/game/object/C4ObjectPtr.cpp
|
||||
src/game/object/C4ObjectPtr.h
|
||||
src/game/object/C4ObjectScript.cpp
|
||||
src/game/object/C4Sector.cpp
|
||||
src/game/object/C4Sector.h
|
||||
src/game/object/C4Shape.cpp
|
||||
src/game/object/C4Shape.h
|
||||
src/game/player/C4Player.cpp
|
||||
src/game/player/C4Player.h
|
||||
src/game/player/C4PlayerList.cpp
|
||||
src/game/player/C4PlayerList.h
|
||||
src/game/player/C4RankSystem.cpp
|
||||
src/game/player/C4RankSystem.h
|
||||
src/game/script/C4Effect.cpp
|
||||
src/game/script/C4Effects.h
|
||||
src/game/script/C4FindObject.cpp
|
||||
src/game/script/C4FindObject.h
|
||||
src/game/script/C4GameScript.cpp
|
||||
src/game/script/C4Script.h
|
||||
src/game/script/C4TransferZone.cpp
|
||||
src/game/script/C4TransferZone.h
|
||||
src/game/C4Viewport.cpp
|
||||
src/game/C4Viewport.h
|
||||
src/gamescript/C4Effect.cpp
|
||||
src/gamescript/C4Effect.h
|
||||
src/gamescript/C4FindObject.cpp
|
||||
src/gamescript/C4FindObject.h
|
||||
src/gamescript/C4GameScript.cpp
|
||||
src/gamescript/C4Script.h
|
||||
src/gamescript/C4TransferZone.cpp
|
||||
src/gamescript/C4TransferZone.h
|
||||
src/graphics/Bitmap256.cpp
|
||||
src/graphics/Bitmap256.h
|
||||
src/graphics/C4Draw.cpp
|
||||
src/graphics/C4DrawD3D.cpp
|
||||
src/graphics/C4DrawD3D.h
|
||||
src/graphics/C4DrawD3DShader.cpp
|
||||
src/graphics/C4DrawD3DShader.h
|
||||
src/graphics/C4DrawGL.cpp
|
||||
src/graphics/C4DrawGLCtx.cpp
|
||||
src/graphics/C4DrawGL.h
|
||||
src/graphics/C4DrawT.cpp
|
||||
src/graphics/C4DrawT.h
|
||||
src/graphics/C4Draw.h
|
||||
src/graphics/C4Facet.cpp
|
||||
src/graphics/C4FacetEx.cpp
|
||||
src/graphics/C4FacetEx.h
|
||||
src/graphics/C4Facet.h
|
||||
src/graphics/C4Fonts.cpp
|
||||
src/graphics/C4Fonts.h
|
||||
src/graphics/C4GraphicsResource.cpp
|
||||
src/graphics/C4GraphicsResource.h
|
||||
src/graphics/C4Surface.cpp
|
||||
src/graphics/C4Surface.h
|
||||
src/graphics/C4SurfaceLoaders.cpp
|
||||
src/graphics/CSurface8.cpp
|
||||
src/graphics/CSurface8.h
|
||||
src/graphics/StdPNG.cpp
|
||||
src/graphics/StdPNG.h
|
||||
src/gui/C4ChatDlg.cpp
|
||||
src/gui/C4ChatDlg.h
|
||||
src/gui/C4DownloadDlg.cpp
|
||||
|
|
@ -373,9 +323,39 @@ set(OC_CLONK_SOURCES
|
|||
src/gui/C4StartupScenSelDlg.h
|
||||
src/gui/C4UpperBoard.cpp
|
||||
src/gui/C4UpperBoard.h
|
||||
src/gui/C4UserMessages.h
|
||||
src/gui/C4Viewport.cpp
|
||||
src/gui/C4Viewport.h
|
||||
src/landscape/C4Landscape.cpp
|
||||
src/landscape/C4Landscape.h
|
||||
src/landscape/C4LandscapeRenderClassic.cpp
|
||||
src/landscape/C4LandscapeRender.cpp
|
||||
src/landscape/C4LandscapeRender.h
|
||||
src/landscape/C4Map.cpp
|
||||
src/landscape/C4MapCreatorS2.cpp
|
||||
src/landscape/C4MapCreatorS2.h
|
||||
src/landscape/C4Map.h
|
||||
src/landscape/C4MassMover.cpp
|
||||
src/landscape/C4MassMover.h
|
||||
src/landscape/C4Material.cpp
|
||||
src/landscape/C4Material.h
|
||||
src/landscape/C4MaterialList.cpp
|
||||
src/landscape/C4MaterialList.h
|
||||
src/landscape/C4Particles.cpp
|
||||
src/landscape/C4Particles.h
|
||||
src/landscape/C4PathFinder.cpp
|
||||
src/landscape/C4PathFinder.h
|
||||
src/landscape/C4PXS.cpp
|
||||
src/landscape/C4PXS.h
|
||||
src/landscape/C4Region.cpp
|
||||
src/landscape/C4Region.h
|
||||
src/landscape/C4Scenario.cpp
|
||||
src/landscape/C4Scenario.h
|
||||
src/landscape/C4Sky.cpp
|
||||
src/landscape/C4Sky.h
|
||||
src/landscape/C4SolidMask.cpp
|
||||
src/landscape/C4SolidMask.h
|
||||
src/landscape/C4Texture.cpp
|
||||
src/landscape/C4Texture.h
|
||||
src/landscape/C4Weather.cpp
|
||||
src/landscape/C4Weather.h
|
||||
src/lib/C4InputValidation.cpp
|
||||
src/lib/C4InputValidation.h
|
||||
src/lib/C4LogBuf.cpp
|
||||
|
|
@ -426,15 +406,6 @@ set(OC_CLONK_SOURCES
|
|||
src/lib/StdResStr2.cpp
|
||||
src/lib/StdResStr2.h
|
||||
src/lib/StdResStr.h
|
||||
src/lib/texture/C4Facet.cpp
|
||||
src/lib/texture/C4FacetEx.cpp
|
||||
src/lib/texture/C4FacetEx.h
|
||||
src/lib/texture/C4Facet.h
|
||||
src/lib/texture/C4GraphicsResource.cpp
|
||||
src/lib/texture/C4GraphicsResource.h
|
||||
src/lib/texture/C4SurfaceLoaders.cpp
|
||||
src/lib/texture/StdPNG.cpp
|
||||
src/lib/texture/StdPNG.h
|
||||
src/network/C4Client.cpp
|
||||
src/network/C4Client.h
|
||||
src/network/C4GameControlNetwork.cpp
|
||||
|
|
@ -469,15 +440,51 @@ set(OC_CLONK_SOURCES
|
|||
src/network/C4Network2UPnP.h
|
||||
src/network/C4Packet2.cpp
|
||||
src/network/C4PacketBase.h
|
||||
src/platform/Bitmap256.cpp
|
||||
src/platform/Bitmap256.h
|
||||
src/object/C4Action.cpp
|
||||
src/object/C4Command.cpp
|
||||
src/object/C4Command.h
|
||||
src/object/C4Def.cpp
|
||||
src/object/C4DefGraphics.cpp
|
||||
src/object/C4DefGraphics.h
|
||||
src/object/C4Def.h
|
||||
src/object/C4DefList.cpp
|
||||
src/object/C4DefList.h
|
||||
src/object/C4GameObjects.cpp
|
||||
src/object/C4GameObjects.h
|
||||
src/object/C4Id.cpp
|
||||
src/object/C4Id.h
|
||||
src/object/C4IDList.cpp
|
||||
src/object/C4IDList.h
|
||||
src/object/C4InfoCore.cpp
|
||||
src/object/C4InfoCore.h
|
||||
src/object/C4MeshAnimation.cpp
|
||||
src/object/C4MeshAnimation.h
|
||||
src/object/C4Movement.cpp
|
||||
src/object/C4ObjectCom.cpp
|
||||
src/object/C4ObjectCom.h
|
||||
src/object/C4Object.cpp
|
||||
src/object/C4Object.h
|
||||
src/object/C4ObjectInfo.cpp
|
||||
src/object/C4ObjectInfo.h
|
||||
src/object/C4ObjectInfoList.cpp
|
||||
src/object/C4ObjectInfoList.h
|
||||
src/object/C4ObjectList.cpp
|
||||
src/object/C4ObjectList.h
|
||||
src/object/C4ObjectMenu.cpp
|
||||
src/object/C4ObjectMenu.h
|
||||
src/object/C4ObjectPtr.cpp
|
||||
src/object/C4ObjectPtr.h
|
||||
src/object/C4ObjectScript.cpp
|
||||
src/object/C4Sector.cpp
|
||||
src/object/C4Sector.h
|
||||
src/object/C4Shape.cpp
|
||||
src/object/C4Shape.h
|
||||
src/platform/C4App.cpp
|
||||
src/platform/C4App.h
|
||||
src/platform/C4AppT.cpp
|
||||
src/platform/C4AppWin32Impl.h
|
||||
src/platform/C4FileMonitor.cpp
|
||||
src/platform/C4FileMonitor.h
|
||||
src/platform/C4Fonts.cpp
|
||||
src/platform/C4Fonts.h
|
||||
src/platform/C4GamePadCon.cpp
|
||||
src/platform/C4GamePadCon.h
|
||||
src/platform/C4MusicFile.cpp
|
||||
|
|
@ -488,43 +495,32 @@ set(OC_CLONK_SOURCES
|
|||
src/platform/C4SoundLoaders.h
|
||||
src/platform/C4SoundSystem.cpp
|
||||
src/platform/C4SoundSystem.h
|
||||
src/platform/C4Surface.cpp
|
||||
src/platform/C4Surface.h
|
||||
src/platform/C4Video.cpp
|
||||
src/platform/C4Video.h
|
||||
src/platform/C4VideoPlayback.cpp
|
||||
src/platform/C4VideoPlayback.h
|
||||
src/platform/C4ViewportWindow.cpp
|
||||
src/platform/C4ViewportWindow.h
|
||||
src/platform/C4Window.h
|
||||
src/platform/C4windowswrapper.h
|
||||
src/platform/GetTime.cpp
|
||||
src/platform/PlatformAbstraction.cpp
|
||||
src/platform/PlatformAbstraction.h
|
||||
src/platform/StdD3D.cpp
|
||||
src/platform/StdD3D.h
|
||||
src/platform/StdD3DShader.cpp
|
||||
src/platform/StdD3DShader.h
|
||||
src/platform/StdDDraw2.cpp
|
||||
src/platform/StdDDraw2.h
|
||||
src/platform/StdFile.cpp
|
||||
src/platform/StdFile.h
|
||||
src/platform/StdFont.cpp
|
||||
src/platform/StdFont.h
|
||||
src/platform/StdGL.cpp
|
||||
src/platform/StdGLCtx.cpp
|
||||
src/platform/StdGL.h
|
||||
src/platform/StdNoGfx.cpp
|
||||
src/platform/StdNoGfx.h
|
||||
src/platform/StdRegistry.cpp
|
||||
src/platform/StdRegistry.h
|
||||
src/platform/StdScheduler.cpp
|
||||
src/platform/StdScheduler.h
|
||||
src/platform/StdSurface8.cpp
|
||||
src/platform/StdSurface8.h
|
||||
src/platform/StdSync.h
|
||||
src/platform/StdVideo.cpp
|
||||
src/platform/StdVideo.h
|
||||
src/player/C4Player.cpp
|
||||
src/player/C4Player.h
|
||||
src/player/C4PlayerList.cpp
|
||||
src/player/C4PlayerList.h
|
||||
src/player/C4RankSystem.cpp
|
||||
src/player/C4RankSystem.h
|
||||
src/script/C4Aul.cpp
|
||||
src/script/C4AulDebug.cpp
|
||||
src/script/C4AulDebug.h
|
||||
|
|
@ -548,8 +544,8 @@ set(OC_CLONK_SOURCES
|
|||
src/script/C4Value.h
|
||||
src/script/C4ValueMap.cpp
|
||||
src/script/C4ValueMap.h
|
||||
src/zlib/gzio.h
|
||||
src/zlib/gzio.c
|
||||
src/zlib/gzio.h
|
||||
src/zlib/zutil.h
|
||||
thirdparty/timsort/sort.h
|
||||
)
|
||||
|
|
@ -565,7 +561,7 @@ if(APPLE)
|
|||
)
|
||||
else()
|
||||
list(APPEND OC_SYSTEM_SOURCES
|
||||
src/C4WinMain.cpp
|
||||
src/game/ClonkMain.cpp
|
||||
)
|
||||
endif()
|
||||
if(WIN32)
|
||||
|
|
@ -620,6 +616,8 @@ if(USE_GTK)
|
|||
|
||||
list(APPEND OC_SYSTEM_SOURCES
|
||||
src/editor/C4ConsoleGTK.cpp
|
||||
src/editor/C4ConsoleGTKDlg.cpp
|
||||
src/editor/C4ConsoleGTKDlg.h
|
||||
src/platform/C4AppGTK.cpp
|
||||
src/platform/C4AppGTKImpl.h
|
||||
src/platform/C4WindowGTK.cpp
|
||||
|
|
@ -663,13 +661,13 @@ if(PROJECT_FOLDERS)
|
|||
source_group("Platform abstraction" src/platform/.*)
|
||||
source_group("Utility" src/lib/.*)
|
||||
source_group("C4Group" src/c4group/.*)
|
||||
source_group("Texture" src/lib/texture/.*)
|
||||
source_group("Graphics" src/graphics/.*)
|
||||
source_group("GUI" src/gui/.*)
|
||||
source_group("Network" src/network/.*)
|
||||
source_group("Object" src/game/object/.*)
|
||||
source_group("Landscape" src/game/landscape/.*)
|
||||
source_group("Player" src/game/player/.*)
|
||||
source_group("Script" REGULAR_EXPRESSION .*/script/.*)
|
||||
source_group("Object" src/object/.*)
|
||||
source_group("Landscape" src/landscape/.*)
|
||||
source_group("Player" src/player/.*)
|
||||
source_group("Script" REGULAR_EXPRESSION .*script/.*)
|
||||
source_group("Config" src/config/.*)
|
||||
source_group("Control" src/control/.*)
|
||||
source_group("Editing" src/editor/.*)
|
||||
|
|
@ -679,20 +677,20 @@ include_directories(
|
|||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/c4group
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/network
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/lib
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/platform
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/config
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/res
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/control
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/gui
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/editor
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/game/landscape
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/game/player
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/game/script
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/game
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/game/object
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/lib/texture
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/gamescript
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/graphics
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/gui
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/landscape
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/lib
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/network
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/object
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/platform
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/player
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/res
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/script
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/thirdparty
|
||||
)
|
||||
|
|
@ -901,10 +899,9 @@ add_executable(clonk WIN32 MACOSX_BUNDLE
|
|||
)
|
||||
|
||||
add_executable(c4group
|
||||
src/c4group/c4group_ng.cpp
|
||||
src/c4group/C4GroupMain.cpp
|
||||
src/c4group/C4Group.cpp
|
||||
src/lib/C4InputValidation.cpp
|
||||
src/config/C4SecurityCertificates.cpp
|
||||
src/c4group/C4Update.cpp
|
||||
src/lib/Standard.cpp
|
||||
src/c4group/CStdFile.cpp
|
||||
|
|
@ -955,7 +952,6 @@ add_executable(c4script
|
|||
src/platform/StdFile.h
|
||||
src/lib/C4Real.cpp
|
||||
src/lib/C4Random.cpp
|
||||
src/script/shell.cpp
|
||||
src/script/C4Aul.cpp
|
||||
src/script/C4AulExec.cpp
|
||||
src/script/C4AulLink.cpp
|
||||
|
|
@ -963,11 +959,12 @@ add_executable(c4script
|
|||
src/script/C4StringTable.cpp
|
||||
src/script/C4PropList.cpp
|
||||
src/script/C4ScriptHost.cpp
|
||||
src/script/C4ScriptMain.cpp
|
||||
src/script/C4ScriptStandalone.cpp
|
||||
src/script/C4ValueArray.cpp
|
||||
src/script/C4Value.cpp
|
||||
src/script/C4ValueMap.cpp
|
||||
src/game/object/C4Id.cpp
|
||||
src/object/C4Id.cpp
|
||||
src/script/C4Script.cpp
|
||||
src/c4group/C4GroupSet.cpp
|
||||
src/c4group/C4ComponentHost.cpp
|
||||
|
|
|
|||
334
Makefile.am
334
Makefile.am
|
|
@ -42,29 +42,23 @@ AM_CPPFLAGS = \
|
|||
-I$(builddir) \
|
||||
-I$(srcdir)/src \
|
||||
-I$(srcdir)/src/c4group \
|
||||
-I$(srcdir)/src/network \
|
||||
-I$(srcdir)/src/lib \
|
||||
-I$(srcdir)/src/platform \
|
||||
-I$(srcdir)/src/config \
|
||||
-I$(srcdir)/src/res \
|
||||
-I$(srcdir)/src/control \
|
||||
-I$(srcdir)/src/gui \
|
||||
-I$(srcdir)/src/editor \
|
||||
-I$(srcdir)/src/game/landscape \
|
||||
-I$(srcdir)/src/game/player \
|
||||
-I$(srcdir)/src/game/script \
|
||||
-I$(srcdir)/src/game \
|
||||
-I$(srcdir)/src/game/object \
|
||||
-I$(srcdir)/src/lib/texture \
|
||||
-I$(srcdir)/src/gamescript \
|
||||
-I$(srcdir)/src/graphics \
|
||||
-I$(srcdir)/src/gui \
|
||||
-I$(srcdir)/src/landscape \
|
||||
-I$(srcdir)/src/lib \
|
||||
-I$(srcdir)/src/network \
|
||||
-I$(srcdir)/src/object \
|
||||
-I$(srcdir)/src/platform \
|
||||
-I$(srcdir)/src/player \
|
||||
-I$(srcdir)/src/res \
|
||||
-I$(srcdir)/src/script \
|
||||
-I$(srcdir)/thirdparty \
|
||||
$(GLEW_CFLAGS) \
|
||||
$(GTK_CFLAGS) \
|
||||
$(OPENAL_CFLAGS) \
|
||||
$(FREETYPE_CFLAGS) \
|
||||
$(SDL_CFLAGS) \
|
||||
$(BOOST_CPPFLAGS) \
|
||||
$(LIBUPNP_CFLAGS)
|
||||
$(BOOST_CPPFLAGS)
|
||||
|
||||
##BUILT_SOURCES = hgrevision.h
|
||||
##hgrevision.h: $(srcdir)/.hg/dirstate
|
||||
|
|
@ -125,8 +119,6 @@ src/c4group/C4Update.cpp \
|
|||
src/c4group/C4Update.h \
|
||||
src/c4group/CStdFile.cpp \
|
||||
src/c4group/CStdFile.h \
|
||||
src/config/C4SecurityCertificates.cpp \
|
||||
src/config/C4SecurityCertificates.h \
|
||||
src/lib/C4InputValidation.cpp \
|
||||
src/lib/C4InputValidation.h \
|
||||
src/lib/SHA1.h \
|
||||
|
|
@ -153,15 +145,7 @@ src/zlib/gzio.h \
|
|||
src/zlib/zutil.h
|
||||
|
||||
clonk_SOURCES = \
|
||||
src/C4Application.cpp \
|
||||
src/C4Application.h \
|
||||
src/C4FullScreen.cpp \
|
||||
src/C4FullScreen.h \
|
||||
src/C4Game.cpp \
|
||||
src/C4Game.h \
|
||||
src/C4Globals.cpp \
|
||||
src/C4GraphicsSystem.cpp \
|
||||
src/C4GraphicsSystem.h \
|
||||
src/c4group/C4ComponentHost.cpp \
|
||||
src/c4group/C4ComponentHost.h \
|
||||
src/c4group/C4Components.h \
|
||||
|
|
@ -176,7 +160,6 @@ src/c4group/C4Language.h \
|
|||
src/C4Include.h \
|
||||
src/C4Prototypes.h \
|
||||
src/C4Version.h.in \
|
||||
src/C4WinMain.cpp \
|
||||
src/config/C4Config.cpp \
|
||||
src/config/C4Config.h \
|
||||
src/config/C4Constants.h \
|
||||
|
|
@ -205,102 +188,63 @@ src/editor/C4Console.cpp \
|
|||
src/editor/C4ConsoleGUICommon.h \
|
||||
src/editor/C4ConsoleGUI.h \
|
||||
src/editor/C4Console.h \
|
||||
src/editor/C4DevmodeDlg.cpp \
|
||||
src/editor/C4DevmodeDlg.h \
|
||||
src/editor/C4EditCursor.cpp \
|
||||
src/editor/C4EditCursor.h \
|
||||
src/editor/C4ObjectListDlg.cpp \
|
||||
src/editor/C4ObjectListDlg.h \
|
||||
src/editor/C4ToolsDlg.cpp \
|
||||
src/editor/C4ToolsDlg.h \
|
||||
src/editor/C4ViewportWindow.cpp \
|
||||
src/editor/C4ViewportWindow.h \
|
||||
src/game/C4Application.cpp \
|
||||
src/game/C4Application.h \
|
||||
src/game/C4FullScreen.cpp \
|
||||
src/game/C4FullScreen.h \
|
||||
src/game/C4Game.cpp \
|
||||
src/game/C4Game.h \
|
||||
src/game/C4GameVersion.h \
|
||||
src/game/C4GraphicsSystem.cpp \
|
||||
src/game/C4GraphicsSystem.h \
|
||||
src/game/C4Physics.h \
|
||||
src/game/landscape/C4Landscape.cpp \
|
||||
src/game/landscape/C4Landscape.h \
|
||||
src/game/landscape/C4LandscapeRenderClassic.cpp \
|
||||
src/game/landscape/C4LandscapeRender.cpp \
|
||||
src/game/landscape/C4LandscapeRender.h \
|
||||
src/game/landscape/C4Map.cpp \
|
||||
src/game/landscape/C4MapCreatorS2.cpp \
|
||||
src/game/landscape/C4MapCreatorS2.h \
|
||||
src/game/landscape/C4Map.h \
|
||||
src/game/landscape/C4MassMover.cpp \
|
||||
src/game/landscape/C4MassMover.h \
|
||||
src/game/landscape/C4Material.cpp \
|
||||
src/game/landscape/C4Material.h \
|
||||
src/game/landscape/C4MaterialList.cpp \
|
||||
src/game/landscape/C4MaterialList.h \
|
||||
src/game/landscape/C4Particles.cpp \
|
||||
src/game/landscape/C4Particles.h \
|
||||
src/game/landscape/C4PathFinder.cpp \
|
||||
src/game/landscape/C4PathFinder.h \
|
||||
src/game/landscape/C4PXS.cpp \
|
||||
src/game/landscape/C4PXS.h \
|
||||
src/game/landscape/C4Region.cpp \
|
||||
src/game/landscape/C4Region.h \
|
||||
src/game/landscape/C4Scenario.cpp \
|
||||
src/game/landscape/C4Scenario.h \
|
||||
src/game/landscape/C4Sky.cpp \
|
||||
src/game/landscape/C4Sky.h \
|
||||
src/game/landscape/C4SolidMask.cpp \
|
||||
src/game/landscape/C4SolidMask.h \
|
||||
src/game/landscape/C4Texture.cpp \
|
||||
src/game/landscape/C4Texture.h \
|
||||
src/game/landscape/C4Weather.cpp \
|
||||
src/game/landscape/C4Weather.h \
|
||||
src/game/object/C4Action.cpp \
|
||||
src/game/object/C4Command.cpp \
|
||||
src/game/object/C4Command.h \
|
||||
src/game/object/C4Def.cpp \
|
||||
src/game/object/C4DefGraphics.cpp \
|
||||
src/game/object/C4DefGraphics.h \
|
||||
src/game/object/C4Def.h \
|
||||
src/game/object/C4DefList.cpp \
|
||||
src/game/object/C4DefList.h \
|
||||
src/game/object/C4GameObjects.cpp \
|
||||
src/game/object/C4GameObjects.h \
|
||||
src/game/object/C4Id.cpp \
|
||||
src/game/object/C4Id.h \
|
||||
src/game/object/C4IDList.cpp \
|
||||
src/game/object/C4IDList.h \
|
||||
src/game/object/C4InfoCore.cpp \
|
||||
src/game/object/C4InfoCore.h \
|
||||
src/game/object/C4MeshAnimation.cpp \
|
||||
src/game/object/C4MeshAnimation.h \
|
||||
src/game/object/C4Movement.cpp \
|
||||
src/game/object/C4ObjectCom.cpp \
|
||||
src/game/object/C4ObjectCom.h \
|
||||
src/game/object/C4Object.cpp \
|
||||
src/game/object/C4Object.h \
|
||||
src/game/object/C4ObjectInfo.cpp \
|
||||
src/game/object/C4ObjectInfo.h \
|
||||
src/game/object/C4ObjectInfoList.cpp \
|
||||
src/game/object/C4ObjectInfoList.h \
|
||||
src/game/object/C4ObjectList.cpp \
|
||||
src/game/object/C4ObjectList.h \
|
||||
src/game/object/C4ObjectMenu.cpp \
|
||||
src/game/object/C4ObjectMenu.h \
|
||||
src/game/object/C4ObjectPtr.cpp \
|
||||
src/game/object/C4ObjectPtr.h \
|
||||
src/game/object/C4ObjectScript.cpp \
|
||||
src/game/object/C4Sector.cpp \
|
||||
src/game/object/C4Sector.h \
|
||||
src/game/object/C4Shape.cpp \
|
||||
src/game/object/C4Shape.h \
|
||||
src/game/player/C4Player.cpp \
|
||||
src/game/player/C4Player.h \
|
||||
src/game/player/C4PlayerList.cpp \
|
||||
src/game/player/C4PlayerList.h \
|
||||
src/game/player/C4RankSystem.cpp \
|
||||
src/game/player/C4RankSystem.h \
|
||||
src/game/script/C4Effect.cpp \
|
||||
src/game/script/C4Effects.h \
|
||||
src/game/script/C4FindObject.cpp \
|
||||
src/game/script/C4FindObject.h \
|
||||
src/game/script/C4GameScript.cpp \
|
||||
src/game/script/C4Script.h \
|
||||
src/game/script/C4TransferZone.cpp \
|
||||
src/game/script/C4TransferZone.h \
|
||||
src/game/C4Viewport.cpp \
|
||||
src/game/C4Viewport.h \
|
||||
src/game/ClonkMain.cpp \
|
||||
src/gamescript/C4Effect.cpp \
|
||||
src/gamescript/C4Effect.h \
|
||||
src/gamescript/C4FindObject.cpp \
|
||||
src/gamescript/C4FindObject.h \
|
||||
src/gamescript/C4GameScript.cpp \
|
||||
src/gamescript/C4Script.h \
|
||||
src/gamescript/C4TransferZone.cpp \
|
||||
src/gamescript/C4TransferZone.h \
|
||||
src/graphics/Bitmap256.cpp \
|
||||
src/graphics/Bitmap256.h \
|
||||
src/graphics/C4Draw.cpp \
|
||||
src/graphics/C4DrawD3D.cpp \
|
||||
src/graphics/C4DrawD3D.h \
|
||||
src/graphics/C4DrawD3DShader.cpp \
|
||||
src/graphics/C4DrawD3DShader.h \
|
||||
src/graphics/C4DrawGL.cpp \
|
||||
src/graphics/C4DrawGLCtx.cpp \
|
||||
src/graphics/C4DrawGL.h \
|
||||
src/graphics/C4DrawT.cpp \
|
||||
src/graphics/C4DrawT.h \
|
||||
src/graphics/C4Draw.h \
|
||||
src/graphics/C4Facet.cpp \
|
||||
src/graphics/C4FacetEx.cpp \
|
||||
src/graphics/C4FacetEx.h \
|
||||
src/graphics/C4Facet.h \
|
||||
src/graphics/C4Fonts.cpp \
|
||||
src/graphics/C4Fonts.h \
|
||||
src/graphics/C4GraphicsResource.cpp \
|
||||
src/graphics/C4GraphicsResource.h \
|
||||
src/graphics/C4Surface.cpp \
|
||||
src/graphics/C4Surface.h \
|
||||
src/graphics/C4SurfaceLoaders.cpp \
|
||||
src/graphics/CSurface8.cpp \
|
||||
src/graphics/CSurface8.h \
|
||||
src/graphics/StdPNG.cpp \
|
||||
src/graphics/StdPNG.h \
|
||||
src/gui/C4ChatDlg.cpp \
|
||||
src/gui/C4ChatDlg.h \
|
||||
src/gui/C4DownloadDlg.cpp \
|
||||
|
|
@ -365,13 +309,41 @@ src/gui/C4StartupPlrSelDlg.cpp \
|
|||
src/gui/C4StartupPlrSelDlg.h \
|
||||
src/gui/C4StartupScenSelDlg.cpp \
|
||||
src/gui/C4StartupScenSelDlg.h \
|
||||
src/gui/C4UpdateDlg.cpp \
|
||||
src/gui/C4UpdateDlg.h \
|
||||
src/gui/C4UpperBoard.cpp \
|
||||
src/gui/C4UpperBoard.h \
|
||||
src/gui/C4UserMessages.h \
|
||||
src/gui/C4Viewport.cpp \
|
||||
src/gui/C4Viewport.h \
|
||||
src/landscape/C4Landscape.cpp \
|
||||
src/landscape/C4Landscape.h \
|
||||
src/landscape/C4LandscapeRenderClassic.cpp \
|
||||
src/landscape/C4LandscapeRender.cpp \
|
||||
src/landscape/C4LandscapeRender.h \
|
||||
src/landscape/C4Map.cpp \
|
||||
src/landscape/C4MapCreatorS2.cpp \
|
||||
src/landscape/C4MapCreatorS2.h \
|
||||
src/landscape/C4Map.h \
|
||||
src/landscape/C4MassMover.cpp \
|
||||
src/landscape/C4MassMover.h \
|
||||
src/landscape/C4Material.cpp \
|
||||
src/landscape/C4Material.h \
|
||||
src/landscape/C4MaterialList.cpp \
|
||||
src/landscape/C4MaterialList.h \
|
||||
src/landscape/C4Particles.cpp \
|
||||
src/landscape/C4Particles.h \
|
||||
src/landscape/C4PathFinder.cpp \
|
||||
src/landscape/C4PathFinder.h \
|
||||
src/landscape/C4PXS.cpp \
|
||||
src/landscape/C4PXS.h \
|
||||
src/landscape/C4Region.cpp \
|
||||
src/landscape/C4Region.h \
|
||||
src/landscape/C4Scenario.cpp \
|
||||
src/landscape/C4Scenario.h \
|
||||
src/landscape/C4Sky.cpp \
|
||||
src/landscape/C4Sky.h \
|
||||
src/landscape/C4SolidMask.cpp \
|
||||
src/landscape/C4SolidMask.h \
|
||||
src/landscape/C4Texture.cpp \
|
||||
src/landscape/C4Texture.h \
|
||||
src/landscape/C4Weather.cpp \
|
||||
src/landscape/C4Weather.h \
|
||||
src/lib/C4LogBuf.cpp \
|
||||
src/lib/C4LogBuf.h \
|
||||
src/lib/C4Log.cpp \
|
||||
|
|
@ -409,15 +381,6 @@ src/lib/StdMeshMath.h \
|
|||
src/lib/StdMeshUpdate.cpp \
|
||||
src/lib/StdMeshUpdate.h \
|
||||
src/lib/StdResStr.h \
|
||||
src/lib/texture/C4Facet.cpp \
|
||||
src/lib/texture/C4FacetEx.cpp \
|
||||
src/lib/texture/C4FacetEx.h \
|
||||
src/lib/texture/C4Facet.h \
|
||||
src/lib/texture/C4GraphicsResource.cpp \
|
||||
src/lib/texture/C4GraphicsResource.h \
|
||||
src/lib/texture/C4SurfaceLoaders.cpp \
|
||||
src/lib/texture/StdPNG.cpp \
|
||||
src/lib/texture/StdPNG.h \
|
||||
src/network/C4Client.cpp \
|
||||
src/network/C4Client.h \
|
||||
src/network/C4GameControlNetwork.cpp \
|
||||
|
|
@ -451,15 +414,51 @@ src/network/C4Network2Stats.h \
|
|||
src/network/C4Network2UPnP.h \
|
||||
src/network/C4Packet2.cpp \
|
||||
src/network/C4PacketBase.h \
|
||||
src/platform/Bitmap256.cpp \
|
||||
src/platform/Bitmap256.h \
|
||||
src/object/C4Action.cpp \
|
||||
src/object/C4Command.cpp \
|
||||
src/object/C4Command.h \
|
||||
src/object/C4Def.cpp \
|
||||
src/object/C4DefGraphics.cpp \
|
||||
src/object/C4DefGraphics.h \
|
||||
src/object/C4Def.h \
|
||||
src/object/C4DefList.cpp \
|
||||
src/object/C4DefList.h \
|
||||
src/object/C4GameObjects.cpp \
|
||||
src/object/C4GameObjects.h \
|
||||
src/object/C4Id.cpp \
|
||||
src/object/C4Id.h \
|
||||
src/object/C4IDList.cpp \
|
||||
src/object/C4IDList.h \
|
||||
src/object/C4InfoCore.cpp \
|
||||
src/object/C4InfoCore.h \
|
||||
src/object/C4MeshAnimation.cpp \
|
||||
src/object/C4MeshAnimation.h \
|
||||
src/object/C4Movement.cpp \
|
||||
src/object/C4ObjectCom.cpp \
|
||||
src/object/C4ObjectCom.h \
|
||||
src/object/C4Object.cpp \
|
||||
src/object/C4Object.h \
|
||||
src/object/C4ObjectInfo.cpp \
|
||||
src/object/C4ObjectInfo.h \
|
||||
src/object/C4ObjectInfoList.cpp \
|
||||
src/object/C4ObjectInfoList.h \
|
||||
src/object/C4ObjectList.cpp \
|
||||
src/object/C4ObjectList.h \
|
||||
src/object/C4ObjectMenu.cpp \
|
||||
src/object/C4ObjectMenu.h \
|
||||
src/object/C4ObjectPtr.cpp \
|
||||
src/object/C4ObjectPtr.h \
|
||||
src/object/C4ObjectScript.cpp \
|
||||
src/object/C4Sector.cpp \
|
||||
src/object/C4Sector.h \
|
||||
src/object/C4Shape.cpp \
|
||||
src/object/C4Shape.h \
|
||||
src/platform/C4App.cpp \
|
||||
src/platform/C4App.h \
|
||||
src/platform/C4AppT.cpp \
|
||||
src/platform/C4AppWin32Impl.h \
|
||||
src/platform/C4FileMonitor.cpp \
|
||||
src/platform/C4FileMonitor.h \
|
||||
src/platform/C4Fonts.cpp \
|
||||
src/platform/C4Fonts.h \
|
||||
src/platform/C4GamePadCon.cpp \
|
||||
src/platform/C4GamePadCon.h \
|
||||
src/platform/C4MusicFile.cpp \
|
||||
|
|
@ -470,36 +469,25 @@ src/platform/C4SoundLoaders.cpp \
|
|||
src/platform/C4SoundLoaders.h \
|
||||
src/platform/C4SoundSystem.cpp \
|
||||
src/platform/C4SoundSystem.h \
|
||||
src/platform/C4Surface.cpp \
|
||||
src/platform/C4Surface.h \
|
||||
src/platform/C4Video.cpp \
|
||||
src/platform/C4Video.h \
|
||||
src/platform/C4VideoPlayback.cpp \
|
||||
src/platform/C4VideoPlayback.h \
|
||||
src/platform/C4ViewportWindow.cpp \
|
||||
src/platform/C4ViewportWindow.h \
|
||||
src/platform/C4Window.h \
|
||||
src/platform/C4windowswrapper.h \
|
||||
src/platform/PlatformAbstraction.cpp \
|
||||
src/platform/PlatformAbstraction.h \
|
||||
src/platform/StdD3D.cpp \
|
||||
src/platform/StdD3D.h \
|
||||
src/platform/StdD3DShader.cpp \
|
||||
src/platform/StdD3DShader.h \
|
||||
src/platform/StdDDraw2.cpp \
|
||||
src/platform/StdDDraw2.h \
|
||||
src/platform/StdFont.cpp \
|
||||
src/platform/StdFont.h \
|
||||
src/platform/StdGL.cpp \
|
||||
src/platform/StdGLCtx.cpp \
|
||||
src/platform/StdGL.h \
|
||||
src/platform/StdNoGfx.cpp \
|
||||
src/platform/StdNoGfx.h \
|
||||
src/platform/StdSurface8.cpp \
|
||||
src/platform/StdSurface8.h \
|
||||
src/platform/StdSync.h \
|
||||
src/platform/StdVideo.cpp \
|
||||
src/platform/StdVideo.h \
|
||||
src/player/C4Player.cpp \
|
||||
src/player/C4Player.h \
|
||||
src/player/C4PlayerList.cpp \
|
||||
src/player/C4PlayerList.h \
|
||||
src/player/C4RankSystem.cpp \
|
||||
src/player/C4RankSystem.h \
|
||||
src/res/Brush.h \
|
||||
src/res/Cursor.h \
|
||||
src/res/Dynamic.h \
|
||||
|
|
@ -561,6 +549,8 @@ else
|
|||
if GTK
|
||||
clonk_SOURCES += \
|
||||
src/editor/C4ConsoleGTK.cpp \
|
||||
src/editor/C4ConsoleGTKDlg.cpp \
|
||||
src/editor/C4ConsoleGTKDlg.h \
|
||||
src/platform/C4AppGTK.cpp \
|
||||
src/platform/C4AppGTKImpl.h \
|
||||
src/platform/C4WindowGTK.cpp
|
||||
|
|
@ -603,6 +593,21 @@ clonk_SOURCES += src/network/C4Network2UPnPDummy.cpp
|
|||
endif
|
||||
endif
|
||||
|
||||
if AUTOUPDATE
|
||||
clonk_SOURCES += \
|
||||
src/gui/C4UpdateDlg.cpp \
|
||||
src/gui/C4UpdateDlg.h
|
||||
endif
|
||||
|
||||
clonk_CPPFLAGS = \
|
||||
$(AM_CPPFLAGS) \
|
||||
$(GLEW_CFLAGS) \
|
||||
$(GTK_CFLAGS) \
|
||||
$(OPENAL_CFLAGS) \
|
||||
$(FREETYPE_CFLAGS) \
|
||||
$(SDL_CFLAGS) \
|
||||
$(LIBUPNP_CFLAGS)
|
||||
|
||||
clonk_LDADD = \
|
||||
lib.a \
|
||||
$(LDADD) \
|
||||
|
|
@ -620,30 +625,9 @@ clonk_LDADD = \
|
|||
.rc.o:
|
||||
$(WINDRES) -I $(srcdir)/src/res -I $(builddir) -i $< -o $@
|
||||
|
||||
c4group_CPPFLAGS = \
|
||||
-I$(builddir) \
|
||||
-I$(srcdir)/src \
|
||||
-I$(srcdir)/src/c4group \
|
||||
-I$(srcdir)/src/network \
|
||||
-I$(srcdir)/src/lib \
|
||||
-I$(srcdir)/src/platform \
|
||||
-I$(srcdir)/src/config \
|
||||
-I$(srcdir)/src/res \
|
||||
-I$(srcdir)/src/control \
|
||||
-I$(srcdir)/src/gui \
|
||||
-I$(srcdir)/src/editor \
|
||||
-I$(srcdir)/src/game/landscape \
|
||||
-I$(srcdir)/src/game/player \
|
||||
-I$(srcdir)/src/game/script \
|
||||
-I$(srcdir)/src/game \
|
||||
-I$(srcdir)/src/game/object \
|
||||
-I$(srcdir)/src/lib/texture \
|
||||
-I$(srcdir)/src/script \
|
||||
$(BOOST_CPPFLAGS)
|
||||
|
||||
c4group_SOURCES = \
|
||||
src/lib/C4SimpleLog.cpp \
|
||||
src/c4group/c4group_ng.cpp
|
||||
src/c4group/C4GroupMain.cpp
|
||||
|
||||
if WIN32
|
||||
c4group_SOURCES += src/c4group/Resource.rc
|
||||
|
|
@ -705,7 +689,6 @@ include/c4script/c4script.h \
|
|||
src/lib/C4SimpleLog.cpp \
|
||||
src/lib/C4Real.cpp \
|
||||
src/lib/C4Random.cpp \
|
||||
src/script/shell.cpp \
|
||||
src/script/C4Aul.cpp \
|
||||
src/script/C4AulExec.cpp \
|
||||
src/script/C4AulLink.cpp \
|
||||
|
|
@ -713,11 +696,12 @@ src/script/C4AulParse.cpp \
|
|||
src/script/C4StringTable.cpp \
|
||||
src/script/C4PropList.cpp \
|
||||
src/script/C4ScriptHost.cpp \
|
||||
src/script/C4ScriptMain.cpp \
|
||||
src/script/C4ScriptStandalone.cpp \
|
||||
src/script/C4ValueArray.cpp \
|
||||
src/script/C4Value.cpp \
|
||||
src/script/C4ValueMap.cpp \
|
||||
src/game/object/C4Id.cpp \
|
||||
src/object/C4Id.cpp \
|
||||
src/script/C4Script.cpp \
|
||||
src/c4group/C4GroupSet.cpp \
|
||||
src/c4group/C4ComponentHost.cpp \
|
||||
|
|
|
|||
22
configure.ac
22
configure.ac
|
|
@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure script.
|
|||
AC_PREREQ([2.67])
|
||||
AC_INIT([clonk], [5])
|
||||
AC_COPYRIGHT([©2005-2011 Günther Brammer])
|
||||
AC_CONFIG_SRCDIR([/src/C4Game.cpp])
|
||||
AC_CONFIG_SRCDIR([/src/C4Include.h])
|
||||
AC_CONFIG_AUX_DIR([autotools])
|
||||
AC_CONFIG_HEADER([config.h])
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
|
|
@ -324,12 +324,13 @@ AS_IF([test $with_upnp = yes], [
|
|||
AM_CONDITIONAL(LIBUPNP, [test "$have_libupnp" = yes])
|
||||
|
||||
# Automatic Update
|
||||
AC_ARG_WITH([automatic-update],
|
||||
[AS_HELP_STRING([--with-automatic-update],[enable support for automatic engine updates [default=yes]])],
|
||||
, [with_automatic_update="yes"])
|
||||
if test "$with_automatic_update" = "yes"; then
|
||||
AC_ARG_ENABLE([autoupdate],
|
||||
[AS_HELP_STRING([--disable-autoupdate],[support for automatic engine updates [default=yes]])],
|
||||
, [enable_autoupdate="yes"])
|
||||
AS_IF([test "$enable_autoupdate" = yes], [
|
||||
AC_DEFINE([WITH_AUTOMATIC_UPDATE], 1, [Enable automatic update system])
|
||||
fi
|
||||
])
|
||||
AM_CONDITIONAL(AUTOUPDATE, [test "$enable_autoupdate" = yes])
|
||||
|
||||
if test $win32 = false; then
|
||||
# pthread
|
||||
|
|
@ -384,19 +385,20 @@ AM_CONDITIONAL(RECENT_GCC, [test $RECENT_GCC = yes])
|
|||
AC_OUTPUT
|
||||
|
||||
echo "Configuration:
|
||||
CFLAGS: $CFLAGS
|
||||
CXXFLAGS: $CXXFLAGS
|
||||
Debug: $enable_debug
|
||||
Debugrec: $enable_debugrec
|
||||
Pure console: $enable_console
|
||||
Autoupdate: $enable_autoupdate
|
||||
DirectX: $with_directx
|
||||
OpenGL: $with_gl
|
||||
Nat/LibUPnP: $ac_cv_header_natupnp_h/$have_libupnp
|
||||
Sound: $enable_sound
|
||||
SDL_Mixer: $with_sdl_mixer
|
||||
OpenAL: $with_openal
|
||||
GTK+: $with_gtk
|
||||
X11: $have_x
|
||||
Nat/LibUPnP: $ac_cv_header_natupnp_h/$have_libupnp
|
||||
CFLAGS: $CFLAGS
|
||||
CXXFLAGS: $CXXFLAGS"
|
||||
X11: $have_x"
|
||||
|
||||
if test "$enable_sdlmainloop" = yes; then echo " SDL: mainloop";
|
||||
else echo " SDL: $with_sdl"; fi
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
/*
|
||||
* OpenClonk, http://www.openclonk.org
|
||||
*
|
||||
* Copyright (c) 2003-2004 Matthes Bender
|
||||
* Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de
|
||||
*
|
||||
* Portions might be copyrighted by other authors who have contributed
|
||||
* to OpenClonk.
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
* See isc_license.txt for full license and disclaimer.
|
||||
*
|
||||
* "Clonk" is a registered trademark of Matthes Bender.
|
||||
* See clonk_trademark_license.txt for full license.
|
||||
*/
|
||||
|
||||
/* Certificate used to verify registration keys. */
|
||||
|
||||
#include "C4Include.h"
|
||||
|
||||
const char* Cert_Reg_XOR_Base64 =
|
||||
"R0deRkkuNHZ/fEgwLjxnfjUicitmdx9eR0deYSklOHJcWCswKghQdDI6ZB12Y2s5IQUpIgwaEn93\n"
|
||||
"Yy02KT9yQBQyWhJxSHM5KA09PSYtKGV3WTo1Jj8LQDc6aC44ZGMiIy8EMScPHGdCaD9HEypJdj0p\n"
|
||||
"ViRkcHMQPigYIR02JgBaUAI2CCNxWDQqAD93cVo+Pj8ePQ86QwhFaAExLmRpbz0ba1gGVWBBWwMg\n"
|
||||
"LyENPHNRdSlCPityTz45ZAdkWWRBUxkpAiYpK2l4QjJBXwliBzYTeQBzUXAUARsbAA0rewhBAiow\n"
|
||||
"Oitkc0EHRDBfC3MQBzwYD1ZVAmtfBwMpPy9WcQRbRiR2cwA+LjsLJTAhQn9ieAk1HF5LeTcqAyd2\n"
|
||||
"e0p5JD4+WCo4O1B7ey8mJj9AQDA6aC5kY2M0Lx05LjY4NGF7c1g0Kl9mcjApfC1jXHgfCD0lHik9\n"
|
||||
"SUZyYzE3PT9if3kuRjBxUV8lHjAkXxwkNXBXcA89PSxyWCcuACBeaHQXHAg0MgM+NmdMUz8XHid2\n"
|
||||
"UwcyWg1KeGYyACgUJTIuMHxiOCA2JR1RBUYZeC9kR2g0PAIXBl1dElh0YTIkDx5QBCESaDJgQlBB\n"
|
||||
"XhI7ASUPM1ZdQwAYAikKQEMpcjt3ZXZBBh95MQlVMFJbZAMXWVdAbRpeWjBmcXAdECs9KQMHAFld\n"
|
||||
"Wy9KHF5xdiIudytzfXAZOysEDD0HMlZvdykBKikCHCAaUmBbXGFDIAYrKiYaAwN+UysJDxRwQEUu\n"
|
||||
"ZQh/AlQYAyUVMzMEPlVSCwQiOCBFXQFYAR5LYgMJDltKKC89CEtXCiQhYRkHbhsOeThrAlA4JxBE\n"
|
||||
"OhIiAnkHBDAXPl0GBxhfHiBFR1YZHRkACS4pQWF8Uw1DWiZnAzQsVQUHBnkaLyMALwhmG3UHAT49\n"
|
||||
"XAIFfzgTWTtocFsdJDk1CQ02FGhFQgYcJQgBYxgocB13c3MnKyQxDA8dGVpfdVEEWyxyZiItcCt9\n"
|
||||
"cDgUOykQHk8FHUN4W1oiEiFHTRBAQTtiV0o8HCImOyVZIQdORCULEwN3TUFYYQVlcFRGHh4kHwFY\n"
|
||||
"E1hCYzIaPS9BPQcTGjABA0InMygLPR0gAVRABS0xAzRqBCINYikEWUQDIgQAIlMGBHVwHQA9DCEG\n"
|
||||
"e1w7W0FkXEInEAAdGSAmFVc8WxIeG1l6QVwABj50B14kHgAQQAcZR3Z6Zg0DLkVdVFwYQ1x9fEEl\n"
|
||||
"Lwg0IRBfBgwLOEVeRkMecj0vESl3YGY6LCMwKjApXBwbH0V5\n"
|
||||
;
|
||||
|
||||
const char* XOR_Cert_Reg = "jjskdlq162hskn37sk1j222s";
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
/*
|
||||
* OpenClonk, http://www.openclonk.org
|
||||
*
|
||||
* Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de
|
||||
*
|
||||
* Portions might be copyrighted by other authors who have contributed
|
||||
* to OpenClonk.
|
||||
*
|
||||
* Permission to use, copy, modify, and/or distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
* See isc_license.txt for full license and disclaimer.
|
||||
*
|
||||
* "Clonk" is a registered trademark of Matthes Bender.
|
||||
* See clonk_trademark_license.txt for full license.
|
||||
*/
|
||||
|
||||
extern const char* Cert_Reg_XOR_Base64;
|
||||
extern const char* XOR_Cert_Reg;
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
# include <res/Cursor.h>
|
||||
# include <res/Brush.h>
|
||||
# include <C4Language.h>
|
||||
# include <C4DevmodeDlg.h>
|
||||
# include <C4ConsoleGTKDlg.h>
|
||||
|
||||
# include <res/Line.h>
|
||||
# include <res/Rect.h>
|
||||
|
|
|
|||
|
|
@ -19,9 +19,7 @@
|
|||
/* Common window for drawing and property tool dialogs in console mode */
|
||||
|
||||
#include <C4Include.h>
|
||||
#include <C4DevmodeDlg.h>
|
||||
|
||||
#ifdef WITH_DEVELOPER_MODE
|
||||
#include <C4ConsoleGTKDlg.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
|
|
@ -129,5 +127,3 @@ void C4DevmodeDlg::SetTitle(GtkWidget* widget, const char* title)
|
|||
if (gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), page_num) == widget)
|
||||
gtk_window_set_title(GTK_WINDOW(window), title);
|
||||
}
|
||||
|
||||
#endif // WITH_DEVELOPER_MODE
|
||||
|
|
@ -23,41 +23,22 @@
|
|||
#include <C4Include.h>
|
||||
#include <C4Console.h>
|
||||
|
||||
#include <C4Aul.h>
|
||||
#include <C4Application.h>
|
||||
#include <C4GameSave.h>
|
||||
#include <C4Game.h>
|
||||
#include <C4MessageInput.h>
|
||||
#include <C4UserMessages.h>
|
||||
#include <C4Version.h>
|
||||
#include <C4Language.h>
|
||||
#include <C4Object.h>
|
||||
#include <C4Player.h>
|
||||
#include <C4Landscape.h>
|
||||
#include <C4GraphicsSystem.h>
|
||||
#include <C4PlayerList.h>
|
||||
#include <C4GameControl.h>
|
||||
#include <C4Texture.h>
|
||||
|
||||
#include <StdFile.h>
|
||||
#include <StdRegistry.h>
|
||||
|
||||
#ifdef USE_GL
|
||||
#include <StdGL.h>
|
||||
#endif
|
||||
|
||||
#ifdef USE_DIRECTX
|
||||
#include <StdD3D.h>
|
||||
#endif
|
||||
|
||||
#include <C4AppWin32Impl.h>
|
||||
#include "C4ConsoleGUI.h"
|
||||
#include <C4DrawGL.h>
|
||||
#include <C4DrawD3D.h>
|
||||
#include <C4Landscape.h>
|
||||
#include <C4Object.h>
|
||||
#include <C4PlayerList.h>
|
||||
#include <C4Texture.h>
|
||||
#include <C4Version.h>
|
||||
#include "C4Viewport.h"
|
||||
#include <StdRegistry.h>
|
||||
|
||||
#include <C4windowswrapper.h>
|
||||
#include <mmsystem.h>
|
||||
#include <commdlg.h>
|
||||
#include "resource.h"
|
||||
|
||||
#define GetWideLPARAM(c) reinterpret_cast<LPARAM>(static_cast<wchar_t*>(GetWideChar(c)))
|
||||
|
||||
inline StdStrBuf::wchar_t_holder LoadResStrW(const char *id) { return GetWideChar(LoadResStr(id)); }
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@
|
|||
#include <C4Game.h>
|
||||
#include <C4GameControl.h>
|
||||
#include <StdRegistry.h>
|
||||
#include <StdD3D.h>
|
||||
#include <C4DrawD3D.h>
|
||||
#ifdef USE_GL
|
||||
#include <StdGL.h>
|
||||
#include <C4DrawGL.h>
|
||||
#endif
|
||||
|
||||
bool C4ToolsDlg::Open()
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include <C4AulDebug.h>
|
||||
#include <C4DefList.h>
|
||||
#include <C4Effects.h>
|
||||
#include <C4Effect.h>
|
||||
#include <C4FileMonitor.h>
|
||||
#include <C4GameSave.h>
|
||||
#include <C4Record.h>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
/* Also contains some helper functions for various landscape effects */
|
||||
|
||||
#include <C4Include.h>
|
||||
#include <C4Effects.h>
|
||||
#include <C4Effect.h>
|
||||
|
||||
#include <C4DefList.h>
|
||||
#include <C4Object.h>
|
||||
|
|
@ -23,14 +23,13 @@
|
|||
|
||||
/* NewGfx interfaces */
|
||||
#include "C4Include.h"
|
||||
#include <StdDDraw2.h>
|
||||
#include <C4Draw.h>
|
||||
|
||||
#include "C4App.h"
|
||||
#include <C4Window.h>
|
||||
#include <StdDDraw2.h>
|
||||
#include <StdD3D.h>
|
||||
#include <StdGL.h>
|
||||
#include <StdNoGfx.h>
|
||||
#include <C4DrawD3D.h>
|
||||
#include <C4DrawGL.h>
|
||||
#include <C4DrawT.h>
|
||||
#include <C4Markup.h>
|
||||
#include <StdFont.h>
|
||||
#include "C4Rect.h"
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
#define INC_STDDDRAW2
|
||||
|
||||
#include <C4Surface.h>
|
||||
#include <StdSurface8.h>
|
||||
#include <CSurface8.h>
|
||||
#include <StdBuf.h>
|
||||
#ifdef _WIN32
|
||||
#include <C4windowswrapper.h>
|
||||
|
|
@ -24,9 +24,9 @@
|
|||
/* Direct3D implementation of NewGfx */
|
||||
|
||||
#include "C4Include.h"
|
||||
#include <StdD3D.h>
|
||||
#include <C4DrawD3D.h>
|
||||
|
||||
#include <StdD3DShader.h>
|
||||
#include <C4DrawD3DShader.h>
|
||||
|
||||
#include <C4App.h>
|
||||
#include <C4Markup.h>
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
/* OpenGL implementation of NewGfx */
|
||||
|
||||
#include "C4Include.h"
|
||||
#include <StdGL.h>
|
||||
#include <C4DrawGL.h>
|
||||
|
||||
#include <C4Surface.h>
|
||||
#include <C4Window.h>
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
#else
|
||||
#include <GL/glu.h>
|
||||
#endif
|
||||
#include <StdDDraw2.h>
|
||||
#include <C4Draw.h>
|
||||
|
||||
class C4Window;
|
||||
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
/* OpenGL implementation of NewGfx, the context */
|
||||
|
||||
#include "C4Include.h"
|
||||
#include <StdGL.h>
|
||||
#include <C4DrawGL.h>
|
||||
|
||||
#include <C4App.h>
|
||||
#include <C4Surface.h>
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
* See clonk_trademark_license.txt for full license.
|
||||
*/
|
||||
#include "C4Include.h"
|
||||
#include <StdNoGfx.h>
|
||||
#include <C4DrawT.h>
|
||||
#include <StdMeshMaterial.h>
|
||||
|
||||
CStdNoGfx::CStdNoGfx()
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
#ifndef INC_StdNoGfx
|
||||
#define INC_StdNoGfx
|
||||
|
||||
#include <StdDDraw2.h>
|
||||
#include <C4Draw.h>
|
||||
|
||||
class CStdNoGfx : public C4Draw
|
||||
{
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
#include <C4Facet.h>
|
||||
#include <C4GraphicsResource.h>
|
||||
|
||||
#include <StdD3D.h>
|
||||
#include <C4DrawD3D.h>
|
||||
#include <StdAdaptors.h>
|
||||
|
||||
#ifdef WITH_GLIB
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
#ifndef INC_C4Facet
|
||||
#define INC_C4Facet
|
||||
|
||||
#include <StdDDraw2.h>
|
||||
#include <C4Draw.h>
|
||||
|
||||
const int32_t C4FCT_None = 0,
|
||||
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
#include <C4Def.h>
|
||||
#include <C4Fonts.h>
|
||||
|
||||
#include <StdGL.h>
|
||||
#include <C4DrawGL.h>
|
||||
|
||||
C4GraphicsResource::C4GraphicsResource():
|
||||
idSfcCaption(0), idSfcButton(0), idSfcButtonD(0), idSfcScroll(0), idSfcContext(0),
|
||||
|
|
@ -28,12 +28,12 @@
|
|||
#include <StdFile.h>
|
||||
#include <CStdFile.h>
|
||||
#include "C4App.h"
|
||||
#include <StdGL.h>
|
||||
#include <C4DrawGL.h>
|
||||
#include <C4Window.h>
|
||||
#include <StdRegistry.h>
|
||||
#include <StdResStr.h>
|
||||
#include <StdDDraw2.h>
|
||||
#include <StdD3D.h>
|
||||
#include <C4Draw.h>
|
||||
#include <C4DrawD3D.h>
|
||||
#include <Bitmap256.h>
|
||||
#include <StdPNG.h>
|
||||
#include <C4Config.h>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
#include <Bitmap256.h>
|
||||
#include <StdPNG.h>
|
||||
#include <StdDDraw2.h>
|
||||
#include <C4Draw.h>
|
||||
|
||||
bool C4Surface::LoadAny(C4Group &hGroup, const char *szName, bool fOwnPal, bool fNoErrIfNotFound)
|
||||
{
|
||||
|
|
@ -20,10 +20,10 @@
|
|||
// a wrapper class to DirectDraw surfaces
|
||||
|
||||
#include "C4Include.h"
|
||||
#include <StdSurface8.h>
|
||||
#include <CSurface8.h>
|
||||
#include <Bitmap256.h>
|
||||
#include <StdPNG.h>
|
||||
#include <StdDDraw2.h>
|
||||
#include <C4Draw.h>
|
||||
#include <CStdFile.h>
|
||||
#include <Bitmap256.h>
|
||||
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
#include <C4GraphicsResource.h> // only for single use of ::GraphicsResource.fctOKCancel below...
|
||||
#include <C4Version.h>
|
||||
#include <StdDDraw2.h>
|
||||
#include <C4Draw.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifndef _WIN32_IE
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
#include <C4Application.h>
|
||||
#include <C4MouseControl.h>
|
||||
#include <C4GraphicsResource.h>
|
||||
#include <StdDDraw2.h>
|
||||
#include <C4Draw.h>
|
||||
|
||||
namespace C4GUI
|
||||
{
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
#include <C4GraphicsResource.h>
|
||||
#include <C4Game.h>
|
||||
|
||||
#include <StdGL.h>
|
||||
#include <C4DrawGL.h>
|
||||
#include <StdRegistry.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#include <C4Network2.h>
|
||||
#include <C4MouseControl.h>
|
||||
|
||||
#include <StdGL.h>
|
||||
#include <C4DrawGL.h>
|
||||
|
||||
// ------------------------------------------------
|
||||
// --- C4StartupOptionsDlg::SmallButton
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
#include <C4GraphicsSystem.h>
|
||||
#include <C4Texture.h>
|
||||
#include <C4Record.h>
|
||||
#include <StdSurface8.h>
|
||||
#include <CSurface8.h>
|
||||
#include <StdPNG.h>
|
||||
#include <C4MaterialList.h>
|
||||
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
#include "C4Shape.h"
|
||||
#include "C4LandscapeRender.h"
|
||||
|
||||
#include <StdSurface8.h>
|
||||
#include <CSurface8.h>
|
||||
#include <C4Material.h>
|
||||
|
||||
const uint8_t GBM = 128,
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
#include "C4GroupSet.h"
|
||||
#include "C4Components.h"
|
||||
|
||||
#include "StdGL.h"
|
||||
#include "C4DrawGL.h"
|
||||
#include "StdColors.h"
|
||||
|
||||
#ifdef USE_GL
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
#include <C4Texture.h>
|
||||
#include <C4Group.h>
|
||||
|
||||
#include <StdSurface8.h>
|
||||
#include <CSurface8.h>
|
||||
#include <Bitmap256.h>
|
||||
|
||||
C4MapCreator::C4MapCreator()
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
#include <C4Aul.h>
|
||||
#include <C4Landscape.h>
|
||||
#include <C4SoundSystem.h>
|
||||
#include <C4Effects.h>
|
||||
#include <C4Effect.h>
|
||||
#include <C4Game.h>
|
||||
#include <C4Log.h>
|
||||
#include <C4Physics.h> // For GravAccel
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include "C4Include.h"
|
||||
#include <C4Markup.h>
|
||||
#include <StdDDraw2.h>
|
||||
#include <C4Draw.h>
|
||||
|
||||
void C4MarkupTagItalic::Apply(C4BltTransform &rBltTrf, bool fDoClr, DWORD &dwClr)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include "C4Include.h"
|
||||
#include <StdMeshMaterial.h>
|
||||
#include <StdMeshUpdate.h>
|
||||
#include <StdDDraw2.h>
|
||||
#include <C4Draw.h>
|
||||
|
||||
#include <cctype>
|
||||
#include <memory>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue