From f9bc90d009d7c96d97e4bfa7a5679e01dddd5dfd Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 28 Sep 2021 21:51:34 +0200 Subject: Created best-guess cmake stubs Structure of the project as whole is... questionable. It looks that the directories are intermingled even if they appear separated. This is a first guess to have at least something in place. --- Stars45/CMakeLists.txt | 214 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) create mode 100644 Stars45/CMakeLists.txt (limited to 'Stars45/CMakeLists.txt') diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt new file mode 100644 index 0000000..02af82d --- /dev/null +++ b/Stars45/CMakeLists.txt @@ -0,0 +1,214 @@ +project(Stars45) +add_executable( + Stars45 + Asteroid.cpp + AudDlg.cpp + AudioConfig.cpp + AwardDlg.cpp + AwardShowDlg.cpp + Callsign.cpp + CameraDirector.cpp + Campaign.cpp + CampaignMissionFighter.cpp + CampaignMissionRequest.cpp + CampaignMissionStarship.cpp + CampaignPlanAssignment.cpp + CampaignPlanEvent.cpp + CampaignPlanMission.cpp + CampaignPlanMovement.cpp + CampaignPlanStrategic.cpp + CampaignSaveGame.cpp + CampaignSituationReport.cpp + CarrierAI.cpp + CmdDlg.cpp + CmdForceDlg.cpp + CmdIntelDlg.cpp + CmdMissionsDlg.cpp + CmdMsgDlg.cpp + CmdOrdersDlg.cpp + CmdTheaterDlg.cpp + CmdTitleDlg.cpp + CmpCompleteDlg.cpp + CmpFileDlg.cpp + CmpLoadDlg.cpp + CmpnScreen.cpp + CmpSceneDlg.cpp + CmpSelectDlg.cpp + CombatAction.cpp + Combatant.cpp + CombatAssignment.cpp + CombatEvent.cpp + CombatGroup.cpp + CombatRoster.cpp + CombatUnit.cpp + CombatZone.cpp + Component.cpp + Computer.cpp + ConfirmDlg.cpp + Contact.cpp + CtlDlg.cpp + DebriefDlg.cpp + Debris.cpp + DetailSet.cpp + DisplayView.cpp + Drive.cpp + DriveSprite.cpp + Drone.cpp + DropShipAI.cpp + Element.cpp + EngDlg.cpp + ExceptionHandler.cpp + ExitDlg.cpp + Explosion.cpp + Farcaster.cpp + FighterAI.cpp + FighterTacticalAI.cpp + FirstTimeDlg.cpp + FlightComp.cpp + FlightDeck.cpp + FlightPlanner.cpp + FltDlg.cpp + Galaxy.cpp + GameScreen.cpp + Grid.cpp + GroundAI.cpp + Hangar.cpp + HardPoint.cpp + Hoop.cpp + HUDSounds.cpp + HUDView.cpp + Instruction.cpp + Intel.cpp + JoyDlg.cpp + KeyDlg.cpp + KeyMap.cpp + LandingGear.cpp + LoadDlg.cpp + LoadScreen.cpp + Main.cpp + MapView.cpp + MenuDlg.cpp + MenuScreen.cpp + MenuView.cpp + Mfd.cpp + Mission.cpp + MissionEvent.cpp + MissionTemplate.cpp + ModConfig.cpp + ModDlg.cpp + ModInfo.cpp + ModInfoDlg.cpp + MsnDlg.cpp + MsnEditDlg.cpp + MsnEditNavDlg.cpp + MsnElemDlg.cpp + MsnEventDlg.cpp + MsnNavDlg.cpp + MsnObjDlg.cpp + MsnPkgDlg.cpp + MsnSelectDlg.cpp + MsnWepDlg.cpp + MusicDirector.cpp + MusicTrack.cpp + NavAI.cpp + NavDlg.cpp + NavLight.cpp + NavSystem.cpp + NetAddrDlg.cpp + NetAdminChat.cpp + NetAdminServer.cpp + NetAuth.cpp + NetBrokerClient.cpp + NetChat.cpp + NetClientConfig.cpp + NetClientDlg.cpp + NetData.cpp + NetFileServlet.cpp + NetGameClient.cpp + NetGame.cpp + NetGameServer.cpp + NetLobbyClient.cpp + NetLobby.cpp + NetLobbyDlg.cpp + NetLobbyServer.cpp + NetPacket.cpp + NetPassDlg.cpp + NetPlayer.cpp + NetServerConfig.cpp + NetServerDlg.cpp + NetUnitDlg.cpp + NetUser.cpp + NetUtil.cpp + NPClientWraps.cpp + OptDlg.cpp + PlanScreen.cpp + Player.cpp + PlayerDlg.cpp + Power.cpp + QuantumDrive.cpp + QuantumFlash.cpp + QuantumView.cpp + QuitView.cpp + RadioHandler.cpp + RadioMessage.cpp + RadioTraffic.cpp + RadioView.cpp + RadioVox.cpp + RLoc.cpp + SeekerAI.cpp + Sensor.cpp + Shield.cpp + ShieldRep.cpp + ShipAI.cpp + Ship.cpp + ShipCtrl.cpp + ShipDesign.cpp + ShipKiller.cpp + ShipSolid.cpp + Shot.cpp + Sim.cpp + SimEvent.cpp + SimObject.cpp + Sky.cpp + StarServer.cpp + Starshatter.cpp + StarshipAI.cpp + StarshipTacticalAI.cpp + StarSystem.cpp + SteerAI.cpp + System.cpp + SystemDesign.cpp + TacRefDlg.cpp + TacticalAI.cpp + TacticalView.cpp + TerrainApron.cpp + TerrainClouds.cpp + Terrain.cpp + TerrainHaze.cpp + TerrainPatch.cpp + TerrainRegion.cpp + Thruster.cpp + TrackIR.cpp + Trail.cpp + VidDlg.cpp + Weapon.cpp + WeaponDesign.cpp + WeaponGroup.cpp + Weather.cpp + WepView.cpp + ) +target_include_directories( + Stars45 + PUBLIC . + ) +target_link_libraries( + Stars45 + PUBLIC FoundationEx + PUBLIC NetEx + PUBLIC nGenEx + # TODO: PUBLIC libpng + # TODO: PUBLIC vorbis + # TODO: PUBLIC Opcode + # TODO: PUBLIC DirectX9 + # TODO: PUBLIC zlib + ) -- cgit v1.1 From c05dd017839be33a636be33cf2c54c99260973b5 Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 29 Sep 2021 23:15:34 +0200 Subject: Updated internal dependencies for nGenEx and Stars45 --- Stars45/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Stars45/CMakeLists.txt') diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt index 02af82d..73d3003 100644 --- a/Stars45/CMakeLists.txt +++ b/Stars45/CMakeLists.txt @@ -204,11 +204,13 @@ target_include_directories( target_link_libraries( Stars45 PUBLIC FoundationEx + PUBLIC Parser PUBLIC NetEx PUBLIC nGenEx - # TODO: PUBLIC libpng - # TODO: PUBLIC vorbis - # TODO: PUBLIC Opcode - # TODO: PUBLIC DirectX9 - # TODO: PUBLIC zlib + PUBLIC Zlib::zlib + PUBLIC Vorbis::vorbis + PUBLIC Vorbis::vorbisfile + PUBLIC Ogg::ogg + PUBLIC Png::png + # TODO: PUBLIC Opcode::opcode ) -- cgit v1.1 From adb8f1fcf0172c4c4299703efea1d0744d03b5e7 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 30 Sep 2021 10:48:15 +0200 Subject: Added Opcode to cmake tree --- Stars45/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Stars45/CMakeLists.txt') diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt index 73d3003..56b1cca 100644 --- a/Stars45/CMakeLists.txt +++ b/Stars45/CMakeLists.txt @@ -200,6 +200,11 @@ add_executable( target_include_directories( Stars45 PUBLIC . + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode/OpcodeLib + ) +target_precompile_headers( + nGenEx + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode/OpcodeLib/StdAfx.h ) target_link_libraries( Stars45 @@ -212,5 +217,5 @@ target_link_libraries( PUBLIC Vorbis::vorbisfile PUBLIC Ogg::ogg PUBLIC Png::png - # TODO: PUBLIC Opcode::opcode + PUBLIC Opcode # FIXME: Add opcode to a namespace. ) -- cgit v1.1 From b601ac6ee335560a5b5e6ac56e911c05092c7b55 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 30 Sep 2021 13:25:32 +0200 Subject: Temporarily added windows sdk include path to stars45 --- Stars45/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Stars45/CMakeLists.txt') diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt index 56b1cca..f860bf8 100644 --- a/Stars45/CMakeLists.txt +++ b/Stars45/CMakeLists.txt @@ -197,10 +197,12 @@ add_executable( Weather.cpp WepView.cpp ) +set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um") target_include_directories( Stars45 PUBLIC . PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode/OpcodeLib + PUBLIC ${WINDOWSSDK_PATH} # FIXME: Resolve this with a Find module or even find out why is going wrong - most sources say that it should be guaranteed. ) target_precompile_headers( nGenEx -- cgit v1.1 From fe6a9d40867e0b3bcd7c5a96cbbc5bde4a102350 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 30 Sep 2021 13:26:12 +0200 Subject: Enabled keyword macros to avoid IcePreprocessor errors --- Stars45/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Stars45/CMakeLists.txt') diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt index f860bf8..35d3b39 100644 --- a/Stars45/CMakeLists.txt +++ b/Stars45/CMakeLists.txt @@ -221,3 +221,7 @@ target_link_libraries( PUBLIC Png::png PUBLIC Opcode # FIXME: Add opcode to a namespace. ) +target_compile_definitions( + Stars45 + PRIVATE _ALLOW_KEYWORD_MACROS + ) -- cgit v1.1 From 966fe28c59f59fc8be795c8215b9352435982445 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 30 Sep 2021 16:46:36 +0200 Subject: Merged nGenEx and Parser into Stars45 --- Stars45/CMakeLists.txt | 112 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 95 insertions(+), 17 deletions(-) (limited to 'Stars45/CMakeLists.txt') diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt index 35d3b39..355c6ef 100644 --- a/Stars45/CMakeLists.txt +++ b/Stars45/CMakeLists.txt @@ -1,13 +1,22 @@ project(Stars45) add_executable( Stars45 + ActiveWindow.cpp + Archive.cpp Asteroid.cpp AudDlg.cpp AudioConfig.cpp + AviFile.cpp AwardDlg.cpp AwardShowDlg.cpp + Bitmap.cpp + Bmp.cpp + Bolt.cpp + Button.cpp Callsign.cpp + Camera.cpp CameraDirector.cpp + CameraView.cpp Campaign.cpp CampaignMissionFighter.cpp CampaignMissionRequest.cpp @@ -31,22 +40,28 @@ add_executable( CmpCompleteDlg.cpp CmpFileDlg.cpp CmpLoadDlg.cpp - CmpnScreen.cpp CmpSceneDlg.cpp CmpSelectDlg.cpp + CmpnScreen.cpp + Color.cpp CombatAction.cpp - Combatant.cpp CombatAssignment.cpp CombatEvent.cpp CombatGroup.cpp CombatRoster.cpp CombatUnit.cpp CombatZone.cpp + Combatant.cpp + ComboBox.cpp + ComboList.cpp Component.cpp Computer.cpp ConfirmDlg.cpp Contact.cpp + ContentBundle.cpp CtlDlg.cpp + D3DXImage.cpp + DataLoader.cpp DebriefDlg.cpp Debris.cpp DetailSet.cpp @@ -55,38 +70,62 @@ add_executable( DriveSprite.cpp Drone.cpp DropShipAI.cpp + EditBox.cpp Element.cpp + Encrypt.cpp EngDlg.cpp + EventDispatch.cpp ExceptionHandler.cpp ExitDlg.cpp Explosion.cpp + FadeView.cpp Farcaster.cpp FighterAI.cpp FighterTacticalAI.cpp FirstTimeDlg.cpp + Fix.cpp FlightComp.cpp FlightDeck.cpp FlightPlanner.cpp FltDlg.cpp + Font.cpp + FontMgr.cpp + FormDef.cpp + FormWindow.cpp + FormatUtil.cpp Galaxy.cpp + Game.cpp GameScreen.cpp + Geometry.cpp + Graphic.cpp Grid.cpp GroundAI.cpp + HUDSounds.cpp + HUDView.cpp Hangar.cpp HardPoint.cpp Hoop.cpp - HUDSounds.cpp - HUDView.cpp + ImageBox.cpp + ImgView.cpp Instruction.cpp Intel.cpp JoyDlg.cpp + Joystick.cpp KeyDlg.cpp KeyMap.cpp + Keyboard.cpp LandingGear.cpp + Layout.cpp + Light.cpp + ListBox.cpp LoadDlg.cpp LoadScreen.cpp + Locale_ss.cpp + MCIWave.cpp + MachineInfo.cpp Main.cpp MapView.cpp + Menu.cpp MenuDlg.cpp MenuScreen.cpp MenuView.cpp @@ -98,6 +137,8 @@ add_executable( ModDlg.cpp ModInfo.cpp ModInfoDlg.cpp + Mouse.cpp + MouseController.cpp MsnDlg.cpp MsnEditDlg.cpp MsnEditNavDlg.cpp @@ -108,8 +149,10 @@ add_executable( MsnPkgDlg.cpp MsnSelectDlg.cpp MsnWepDlg.cpp + MultiController.cpp MusicDirector.cpp MusicTrack.cpp + NPClientWraps.cpp NavAI.cpp NavDlg.cpp NavLight.cpp @@ -124,11 +167,11 @@ add_executable( NetClientDlg.cpp NetData.cpp NetFileServlet.cpp - NetGameClient.cpp NetGame.cpp + NetGameClient.cpp NetGameServer.cpp - NetLobbyClient.cpp NetLobby.cpp + NetLobbyClient.cpp NetLobbyDlg.cpp NetLobbyServer.cpp NetPacket.cpp @@ -139,28 +182,44 @@ add_executable( NetUnitDlg.cpp NetUser.cpp NetUtil.cpp - NPClientWraps.cpp OptDlg.cpp + PCX.CPP + ParseUtil.cpp + Parser.cpp + Particles.cpp + Physical.cpp PlanScreen.cpp Player.cpp PlayerDlg.cpp + PngImage.cpp + Polygon.cpp Power.cpp + Projector.cpp QuantumDrive.cpp QuantumFlash.cpp QuantumView.cpp QuitView.cpp + RLoc.cpp RadioHandler.cpp RadioMessage.cpp RadioTraffic.cpp RadioView.cpp RadioVox.cpp - RLoc.cpp + Random.cpp + Reader.cpp + Res.cpp + RichTextBox.cpp + Scene.cpp + Screen.cpp + ScrollWindow.cpp SeekerAI.cpp Sensor.cpp + Sha1.cpp + Shadow.cpp Shield.cpp ShieldRep.cpp - ShipAI.cpp Ship.cpp + ShipAI.cpp ShipCtrl.cpp ShipDesign.cpp ShipKiller.cpp @@ -169,51 +228,70 @@ add_executable( Sim.cpp SimEvent.cpp SimObject.cpp + Skin.cpp Sky.cpp + Slider.cpp + Solid.cpp + Sound.cpp + SoundCard.cpp + SoundD3D.cpp + Sprite.cpp StarServer.cpp + StarSystem.cpp Starshatter.cpp StarshipAI.cpp StarshipTacticalAI.cpp - StarSystem.cpp SteerAI.cpp System.cpp SystemDesign.cpp TacRefDlg.cpp TacticalAI.cpp TacticalView.cpp + Term.cpp + Terrain.cpp TerrainApron.cpp TerrainClouds.cpp - Terrain.cpp TerrainHaze.cpp TerrainPatch.cpp TerrainRegion.cpp + TexCubeDX9.cpp + TexDX9.cpp Thruster.cpp + Token.cpp TrackIR.cpp Trail.cpp VidDlg.cpp + Video.cpp + VideoDX9.cpp + VideoDX9Enum.cpp + VideoDX9VertexBuffer.cpp + VideoFactory.cpp + VideoSettings.cpp + Water.cpp Weapon.cpp WeaponDesign.cpp WeaponGroup.cpp Weather.cpp + WebBrowser.cpp WepView.cpp + Window.cpp ) set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um") target_include_directories( Stars45 - PUBLIC . - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode/OpcodeLib + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode/OpcodeLib # FIXME: Opcode is badly injured. + PUBLIC $ENV{DXSDK_DIR}/Include PUBLIC ${WINDOWSSDK_PATH} # FIXME: Resolve this with a Find module or even find out why is going wrong - most sources say that it should be guaranteed. ) target_precompile_headers( - nGenEx - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode/OpcodeLib/StdAfx.h + Stars45 + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode/OpcodeLib/StdAfx.h ) target_link_libraries( Stars45 PUBLIC FoundationEx - PUBLIC Parser PUBLIC NetEx - PUBLIC nGenEx PUBLIC Zlib::zlib PUBLIC Vorbis::vorbis PUBLIC Vorbis::vorbisfile -- cgit v1.1 From 317ff02648d76eb875a1826ef7fcc72b8e497235 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 30 Sep 2021 18:02:36 +0200 Subject: Added dx9 and win32 libraries to linker --- Stars45/CMakeLists.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Stars45/CMakeLists.txt') diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt index 355c6ef..d80842b 100644 --- a/Stars45/CMakeLists.txt +++ b/Stars45/CMakeLists.txt @@ -276,7 +276,9 @@ add_executable( WepView.cpp Window.cpp ) +set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0/um/x86") set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um") +set_target_properties(Stars45 PROPERTIES WIN32_EXECUTABLE Yes) target_include_directories( Stars45 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} @@ -298,6 +300,16 @@ target_link_libraries( PUBLIC Ogg::ogg PUBLIC Png::png PUBLIC Opcode # FIXME: Add opcode to a namespace. + PUBLIC ${WINDOWSSDK_LIBPATH}/Ws2_32.lib + PUBLIC ${WINDOWSSDK_LIBPATH}/Vfw32.lib + PUBLIC ${WINDOWSSDK_LIBPATH}/wsock32.lib + PUBLIC ${WINDOWSSDK_LIBPATH}/winmm.lib + PUBLIC ${WINDOWSSDK_LIBPATH}/version.lib + PUBLIC $ENV{DXSDK_DIR}/Lib/x86/dinput8.lib + PUBLIC $ENV{DXSDK_DIR}/Lib/x86/dsound.lib + PUBLIC $ENV{DXSDK_DIR}/Lib/x86/d3d9.lib + PUBLIC $ENV{DXSDK_DIR}/Lib/x86/d3dx9.lib + PUBLIC $ENV{DXSDK_DIR}/Lib/x86/dxguid.lib ) target_compile_definitions( Stars45 -- cgit v1.1 From 01bd9be930937561e1226417328137ea104a89e2 Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 1 Oct 2021 18:49:07 +0200 Subject: Partially fixed Magic2 build --- Stars45/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Stars45/CMakeLists.txt') diff --git a/Stars45/CMakeLists.txt b/Stars45/CMakeLists.txt index d80842b..be5c744 100644 --- a/Stars45/CMakeLists.txt +++ b/Stars45/CMakeLists.txt @@ -1,6 +1,6 @@ project(Stars45) add_executable( - Stars45 + Stars45 WIN32 ActiveWindow.cpp Archive.cpp Asteroid.cpp @@ -276,9 +276,6 @@ add_executable( WepView.cpp Window.cpp ) -set(WINDOWSSDK_LIBPATH "C:/Program Files (x86)/Windows Kits/10/Lib/10.0.19041.0/um/x86") -set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um") -set_target_properties(Stars45 PROPERTIES WIN32_EXECUTABLE Yes) target_include_directories( Stars45 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} -- cgit v1.1