172 files changed, 95 insertions, 139 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbed4ca..7d9da28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,10 +6,8 @@ add_subdirectory(FoundationEx)
 add_subdirectory(libpng)  # is a third-party library.
 add_subdirectory(Magic2)
 add_subdirectory(NetEx)
-add_subdirectory(nGenEx)
 add_subdirectory(ogg)  # is a third-party library.
 add_subdirectory(Opcode)  # is a third-party library.
-add_subdirectory(Parser)
 add_subdirectory(Stars45)
 add_subdirectory(vorbis)  # is a third-party library.
 add_subdirectory(zlib)  # is a third-party library.
diff --git a/Parser/CMakeLists.txt b/Parser/CMakeLists.txt
deleted file mode 100644
index da2f2cd..0000000
--- a/Parser/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-project(Parser)
-add_library(
-	Parser
-	STATIC
-	Parser.cpp
-	Reader.cpp
-	Term.cpp
-	Token.cpp
-	)
-target_include_directories(
-	Parser
-	PUBLIC .
-	)
-target_link_libraries(
-	Parser
-	PRIVATE FoundationEx
-	)
diff --git a/nGenEx/ActiveWindow.cpp b/Stars45/ActiveWindow.cpp
index 4d78b72..4d78b72 100644
--- a/nGenEx/ActiveWindow.cpp
+++ b/Stars45/ActiveWindow.cpp
diff --git a/nGenEx/ActiveWindow.h b/Stars45/ActiveWindow.h
index 2585e54..2585e54 100644
--- a/nGenEx/ActiveWindow.h
+++ b/Stars45/ActiveWindow.h
diff --git a/nGenEx/Archive.cpp b/Stars45/Archive.cpp
index 4b6462a..4b6462a 100644
--- a/nGenEx/Archive.cpp
+++ b/Stars45/Archive.cpp
diff --git a/nGenEx/Archive.h b/Stars45/Archive.h
index 5818cf6..5818cf6 100644
--- a/nGenEx/Archive.h
+++ b/Stars45/Archive.h
diff --git a/nGenEx/AviFile.cpp b/Stars45/AviFile.cpp
index abc1c35..abc1c35 100644
--- a/nGenEx/AviFile.cpp
+++ b/Stars45/AviFile.cpp
diff --git a/nGenEx/AviFile.h b/Stars45/AviFile.h
index 93de964..93de964 100644
--- a/nGenEx/AviFile.h
+++ b/Stars45/AviFile.h
diff --git a/nGenEx/Bitmap.cpp b/Stars45/Bitmap.cpp
index 65adf84..65adf84 100644
--- a/nGenEx/Bitmap.cpp
+++ b/Stars45/Bitmap.cpp
diff --git a/nGenEx/Bitmap.h b/Stars45/Bitmap.h
index af9b6cb..af9b6cb 100644
--- a/nGenEx/Bitmap.h
+++ b/Stars45/Bitmap.h
diff --git a/nGenEx/Bmp.cpp b/Stars45/Bmp.cpp
index 600b230..600b230 100644
--- a/nGenEx/Bmp.cpp
+++ b/Stars45/Bmp.cpp
diff --git a/nGenEx/Bmp.h b/Stars45/Bmp.h
index 4901d65..4901d65 100644
--- a/nGenEx/Bmp.h
+++ b/Stars45/Bmp.h
diff --git a/nGenEx/Bolt.cpp b/Stars45/Bolt.cpp
index f9ffd2c..f9ffd2c 100644
--- a/nGenEx/Bolt.cpp
+++ b/Stars45/Bolt.cpp
diff --git a/nGenEx/Bolt.h b/Stars45/Bolt.h
index 9df4eb7..9df4eb7 100644
--- a/nGenEx/Bolt.h
+++ b/Stars45/Bolt.h
diff --git a/nGenEx/Button.cpp b/Stars45/Button.cpp
index 292e29a..292e29a 100644
--- a/nGenEx/Button.cpp
+++ b/Stars45/Button.cpp
diff --git a/nGenEx/Button.h b/Stars45/Button.h
index 16c71df..16c71df 100644
--- a/nGenEx/Button.h
+++ b/Stars45/Button.h
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
diff --git a/nGenEx/Camera.cpp b/Stars45/Camera.cpp
index 412d1f1..412d1f1 100644
--- a/nGenEx/Camera.cpp
+++ b/Stars45/Camera.cpp
diff --git a/nGenEx/Camera.h b/Stars45/Camera.h
index cd3291a..cd3291a 100644
--- a/nGenEx/Camera.h
+++ b/Stars45/Camera.h
diff --git a/nGenEx/CameraView.cpp b/Stars45/CameraView.cpp
index 0dbb984..0dbb984 100644
--- a/nGenEx/CameraView.cpp
+++ b/Stars45/CameraView.cpp
diff --git a/nGenEx/CameraView.h b/Stars45/CameraView.h
index 2ab133c..2ab133c 100644
--- a/nGenEx/CameraView.h
+++ b/Stars45/CameraView.h
diff --git a/nGenEx/Color.cpp b/Stars45/Color.cpp
index 8c6bdd8..8c6bdd8 100644
--- a/nGenEx/Color.cpp
+++ b/Stars45/Color.cpp
diff --git a/nGenEx/Color.h b/Stars45/Color.h
index 9bca5c9..9bca5c9 100644
--- a/nGenEx/Color.h
+++ b/Stars45/Color.h
diff --git a/nGenEx/ComboBox.cpp b/Stars45/ComboBox.cpp
index 4a5d919..4a5d919 100644
--- a/nGenEx/ComboBox.cpp
+++ b/Stars45/ComboBox.cpp
diff --git a/nGenEx/ComboBox.h b/Stars45/ComboBox.h
index 4d50c73..4d50c73 100644
--- a/nGenEx/ComboBox.h
+++ b/Stars45/ComboBox.h
diff --git a/nGenEx/ComboList.cpp b/Stars45/ComboList.cpp
index 4bf35cc..4bf35cc 100644
--- a/nGenEx/ComboList.cpp
+++ b/Stars45/ComboList.cpp
diff --git a/nGenEx/ComboList.h b/Stars45/ComboList.h
index aea08fc..aea08fc 100644
--- a/nGenEx/ComboList.h
+++ b/Stars45/ComboList.h
diff --git a/nGenEx/ContentBundle.cpp b/Stars45/ContentBundle.cpp
index 7d0e250..7d0e250 100644
--- a/nGenEx/ContentBundle.cpp
+++ b/Stars45/ContentBundle.cpp
diff --git a/nGenEx/ContentBundle.h b/Stars45/ContentBundle.h
index d75a817..d75a817 100644
--- a/nGenEx/ContentBundle.h
+++ b/Stars45/ContentBundle.h
diff --git a/nGenEx/D3DXImage.cpp b/Stars45/D3DXImage.cpp
index 1947137..1947137 100644
--- a/nGenEx/D3DXImage.cpp
+++ b/Stars45/D3DXImage.cpp
diff --git a/nGenEx/D3DXImage.h b/Stars45/D3DXImage.h
index b6f689d..b6f689d 100644
--- a/nGenEx/D3DXImage.h
+++ b/Stars45/D3DXImage.h
diff --git a/nGenEx/DataLoader.cpp b/Stars45/DataLoader.cpp
index 54e2c15..54e2c15 100644
--- a/nGenEx/DataLoader.cpp
+++ b/Stars45/DataLoader.cpp
diff --git a/nGenEx/DataLoader.h b/Stars45/DataLoader.h
index ca7b050..ca7b050 100644
--- a/nGenEx/DataLoader.h
+++ b/Stars45/DataLoader.h
diff --git a/nGenEx/Director.h b/Stars45/Director.h
index 94f635f..94f635f 100644
--- a/nGenEx/Director.h
+++ b/Stars45/Director.h
diff --git a/nGenEx/EditBox.cpp b/Stars45/EditBox.cpp
index c2ed3a1..c2ed3a1 100644
--- a/nGenEx/EditBox.cpp
+++ b/Stars45/EditBox.cpp
diff --git a/nGenEx/EditBox.h b/Stars45/EditBox.h
index ac3186b..ac3186b 100644
--- a/nGenEx/EditBox.h
+++ b/Stars45/EditBox.h
diff --git a/nGenEx/Encrypt.cpp b/Stars45/Encrypt.cpp
index 48ffcdf..48ffcdf 100644
--- a/nGenEx/Encrypt.cpp
+++ b/Stars45/Encrypt.cpp
diff --git a/nGenEx/Encrypt.h b/Stars45/Encrypt.h
index 16cf400..16cf400 100644
--- a/nGenEx/Encrypt.h
+++ b/Stars45/Encrypt.h
diff --git a/nGenEx/EventDispatch.cpp b/Stars45/EventDispatch.cpp
index 25f260b..25f260b 100644
--- a/nGenEx/EventDispatch.cpp
+++ b/Stars45/EventDispatch.cpp
diff --git a/nGenEx/EventDispatch.h b/Stars45/EventDispatch.h
index 08240d0..08240d0 100644
--- a/nGenEx/EventDispatch.h
+++ b/Stars45/EventDispatch.h
diff --git a/nGenEx/EventTarget.h b/Stars45/EventTarget.h
index fe8d8ed..fe8d8ed 100644
--- a/nGenEx/EventTarget.h
+++ b/Stars45/EventTarget.h
diff --git a/nGenEx/FadeView.cpp b/Stars45/FadeView.cpp
index 75940a0..75940a0 100644
--- a/nGenEx/FadeView.cpp
+++ b/Stars45/FadeView.cpp
diff --git a/nGenEx/FadeView.h b/Stars45/FadeView.h
index 3b49c70..3b49c70 100644
--- a/nGenEx/FadeView.h
+++ b/Stars45/FadeView.h
diff --git a/nGenEx/Fix.cpp b/Stars45/Fix.cpp
index 57d7e18..57d7e18 100644
--- a/nGenEx/Fix.cpp
+++ b/Stars45/Fix.cpp
diff --git a/nGenEx/Fix.h b/Stars45/Fix.h
index d3aade0..d3aade0 100644
--- a/nGenEx/Fix.h
+++ b/Stars45/Fix.h
diff --git a/nGenEx/Font.cpp b/Stars45/Font.cpp
index 83f0430..83f0430 100644
--- a/nGenEx/Font.cpp
+++ b/Stars45/Font.cpp
diff --git a/nGenEx/Font.h b/Stars45/Font.h
index 5944f30..5944f30 100644
--- a/nGenEx/Font.h
+++ b/Stars45/Font.h
diff --git a/nGenEx/FontMgr.cpp b/Stars45/FontMgr.cpp
index 9264e6b..9264e6b 100644
--- a/nGenEx/FontMgr.cpp
+++ b/Stars45/FontMgr.cpp
diff --git a/nGenEx/FontMgr.h b/Stars45/FontMgr.h
index e143a2b..e143a2b 100644
--- a/nGenEx/FontMgr.h
+++ b/Stars45/FontMgr.h
diff --git a/nGenEx/FormDef.cpp b/Stars45/FormDef.cpp
index ec1bc92..ec1bc92 100644
--- a/nGenEx/FormDef.cpp
+++ b/Stars45/FormDef.cpp
diff --git a/nGenEx/FormDef.h b/Stars45/FormDef.h
index 0c86743..0c86743 100644
--- a/nGenEx/FormDef.h
+++ b/Stars45/FormDef.h
diff --git a/nGenEx/FormWindow.cpp b/Stars45/FormWindow.cpp
index 83595b9..83595b9 100644
--- a/nGenEx/FormWindow.cpp
+++ b/Stars45/FormWindow.cpp
diff --git a/nGenEx/FormWindow.h b/Stars45/FormWindow.h
index fb6576d..fb6576d 100644
--- a/nGenEx/FormWindow.h
+++ b/Stars45/FormWindow.h
diff --git a/nGenEx/FormatUtil.cpp b/Stars45/FormatUtil.cpp
index 43a5c58..43a5c58 100644
--- a/nGenEx/FormatUtil.cpp
+++ b/Stars45/FormatUtil.cpp
diff --git a/nGenEx/FormatUtil.h b/Stars45/FormatUtil.h
index f652660..f652660 100644
--- a/nGenEx/FormatUtil.h
+++ b/Stars45/FormatUtil.h
diff --git a/nGenEx/Game.cpp b/Stars45/Game.cpp
index 3bfcd57..3bfcd57 100644
--- a/nGenEx/Game.cpp
+++ b/Stars45/Game.cpp
diff --git a/nGenEx/Game.h b/Stars45/Game.h
index c94a273..c94a273 100644
--- a/nGenEx/Game.h
+++ b/Stars45/Game.h
diff --git a/nGenEx/Geometry.cpp b/Stars45/Geometry.cpp
index 74d6f53..74d6f53 100644
--- a/nGenEx/Geometry.cpp
+++ b/Stars45/Geometry.cpp
diff --git a/nGenEx/Geometry.h b/Stars45/Geometry.h
index f6b34cf..f6b34cf 100644
--- a/nGenEx/Geometry.h
+++ b/Stars45/Geometry.h
diff --git a/nGenEx/Graphic.cpp b/Stars45/Graphic.cpp
index 551da18..551da18 100644
--- a/nGenEx/Graphic.cpp
+++ b/Stars45/Graphic.cpp
diff --git a/nGenEx/Graphic.h b/Stars45/Graphic.h
index 1417f48..1417f48 100644
--- a/nGenEx/Graphic.h
+++ b/Stars45/Graphic.h
diff --git a/nGenEx/IA3D.H b/Stars45/IA3D.H
index 9e4e319..9e4e319 100644
--- a/nGenEx/IA3D.H
+++ b/Stars45/IA3D.H
diff --git a/nGenEx/ImageBox.cpp b/Stars45/ImageBox.cpp
index bdec199..bdec199 100644
--- a/nGenEx/ImageBox.cpp
+++ b/Stars45/ImageBox.cpp
diff --git a/nGenEx/ImageBox.h b/Stars45/ImageBox.h
index cbfa3c4..cbfa3c4 100644
--- a/nGenEx/ImageBox.h
+++ b/Stars45/ImageBox.h
diff --git a/nGenEx/ImgView.cpp b/Stars45/ImgView.cpp
index 4f258cd..4f258cd 100644
--- a/nGenEx/ImgView.cpp
+++ b/Stars45/ImgView.cpp
diff --git a/nGenEx/ImgView.h b/Stars45/ImgView.h
index 189877c..189877c 100644
--- a/nGenEx/ImgView.h
+++ b/Stars45/ImgView.h
diff --git a/nGenEx/Joystick.cpp b/Stars45/Joystick.cpp
index 6c3e401..6c3e401 100644
--- a/nGenEx/Joystick.cpp
+++ b/Stars45/Joystick.cpp
diff --git a/nGenEx/Joystick.h b/Stars45/Joystick.h
index 263f9a5..263f9a5 100644
--- a/nGenEx/Joystick.h
+++ b/Stars45/Joystick.h
diff --git a/nGenEx/Keyboard.cpp b/Stars45/Keyboard.cpp
index 21e4181..21e4181 100644
--- a/nGenEx/Keyboard.cpp
+++ b/Stars45/Keyboard.cpp
diff --git a/nGenEx/Keyboard.h b/Stars45/Keyboard.h
index 5ce09a3..5ce09a3 100644
--- a/nGenEx/Keyboard.h
+++ b/Stars45/Keyboard.h
diff --git a/nGenEx/Layout.cpp b/Stars45/Layout.cpp
index 05c1eb2..05c1eb2 100644
--- a/nGenEx/Layout.cpp
+++ b/Stars45/Layout.cpp
diff --git a/nGenEx/Layout.h b/Stars45/Layout.h
index 715121b..715121b 100644
--- a/nGenEx/Layout.h
+++ b/Stars45/Layout.h
diff --git a/nGenEx/Light.cpp b/Stars45/Light.cpp
index 7815078..7815078 100644
--- a/nGenEx/Light.cpp
+++ b/Stars45/Light.cpp
diff --git a/nGenEx/Light.h b/Stars45/Light.h
index 8c1bc1b..8c1bc1b 100644
--- a/nGenEx/Light.h
+++ b/Stars45/Light.h
diff --git a/nGenEx/ListBox.cpp b/Stars45/ListBox.cpp
index 2992393..2992393 100644
--- a/nGenEx/ListBox.cpp
+++ b/Stars45/ListBox.cpp
diff --git a/nGenEx/ListBox.h b/Stars45/ListBox.h
index a792017..a792017 100644
--- a/nGenEx/ListBox.h
+++ b/Stars45/ListBox.h
diff --git a/nGenEx/Locale_ss.cpp b/Stars45/Locale_ss.cpp
index d079791..d079791 100644
--- a/nGenEx/Locale_ss.cpp
+++ b/Stars45/Locale_ss.cpp
diff --git a/nGenEx/Locale_ss.h b/Stars45/Locale_ss.h
index 29c12cf..29c12cf 100644
--- a/nGenEx/Locale_ss.h
+++ b/Stars45/Locale_ss.h
diff --git a/nGenEx/MCIWave.cpp b/Stars45/MCIWave.cpp
index 25bfdad..25bfdad 100644
--- a/nGenEx/MCIWave.cpp
+++ b/Stars45/MCIWave.cpp
diff --git a/nGenEx/MCIWave.h b/Stars45/MCIWave.h
index 41b1311..41b1311 100644
--- a/nGenEx/MCIWave.h
+++ b/Stars45/MCIWave.h
diff --git a/nGenEx/MachineInfo.cpp b/Stars45/MachineInfo.cpp
index 6b9e2cd..6b9e2cd 100644
--- a/nGenEx/MachineInfo.cpp
+++ b/Stars45/MachineInfo.cpp
diff --git a/nGenEx/MachineInfo.h b/Stars45/MachineInfo.h
index 26b1223..26b1223 100644
--- a/nGenEx/MachineInfo.h
+++ b/Stars45/MachineInfo.h
diff --git a/nGenEx/Menu.cpp b/Stars45/Menu.cpp
index 8a3caad..8a3caad 100644
--- a/nGenEx/Menu.cpp
+++ b/Stars45/Menu.cpp
diff --git a/nGenEx/Menu.h b/Stars45/Menu.h
index ac142d3..ac142d3 100644
--- a/nGenEx/Menu.h
+++ b/Stars45/Menu.h
diff --git a/nGenEx/MotionController.h b/Stars45/MotionController.h
index 69938e3..69938e3 100644
--- a/nGenEx/MotionController.h
+++ b/Stars45/MotionController.h
diff --git a/nGenEx/Mouse.cpp b/Stars45/Mouse.cpp
index ec86430..ec86430 100644
--- a/nGenEx/Mouse.cpp
+++ b/Stars45/Mouse.cpp
diff --git a/nGenEx/Mouse.h b/Stars45/Mouse.h
index 07bc98f..07bc98f 100644
--- a/nGenEx/Mouse.h
+++ b/Stars45/Mouse.h
diff --git a/nGenEx/MouseController.cpp b/Stars45/MouseController.cpp
index ae7f455..ae7f455 100644
--- a/nGenEx/MouseController.cpp
+++ b/Stars45/MouseController.cpp
diff --git a/nGenEx/MouseController.h b/Stars45/MouseController.h
index b8bbe5e..b8bbe5e 100644
--- a/nGenEx/MouseController.h
+++ b/Stars45/MouseController.h
diff --git a/nGenEx/MultiController.cpp b/Stars45/MultiController.cpp
index 2c79374..2c79374 100644
--- a/nGenEx/MultiController.cpp
+++ b/Stars45/MultiController.cpp
diff --git a/nGenEx/MultiController.h b/Stars45/MultiController.h
index c15cc61..c15cc61 100644
--- a/nGenEx/MultiController.h
+++ b/Stars45/MultiController.h
diff --git a/nGenEx/PCX.CPP b/Stars45/PCX.CPP
index e510eab..e510eab 100644
--- a/nGenEx/PCX.CPP
+++ b/Stars45/PCX.CPP
diff --git a/nGenEx/ParseUtil.cpp b/Stars45/ParseUtil.cpp
index bb65511..bb65511 100644
--- a/nGenEx/ParseUtil.cpp
+++ b/Stars45/ParseUtil.cpp
diff --git a/nGenEx/ParseUtil.h b/Stars45/ParseUtil.h
index b958e6e..b958e6e 100644
--- a/nGenEx/ParseUtil.h
+++ b/Stars45/ParseUtil.h
diff --git a/Parser/Parser.cpp b/Stars45/Parser.cpp
index 4a84841..4a84841 100644
--- a/Parser/Parser.cpp
+++ b/Stars45/Parser.cpp
diff --git a/Parser/Parser.h b/Stars45/Parser.h
index 2329d71..2329d71 100644
--- a/Parser/Parser.h
+++ b/Stars45/Parser.h
diff --git a/nGenEx/Particles.cpp b/Stars45/Particles.cpp
index a8efbec..a8efbec 100644
--- a/nGenEx/Particles.cpp
+++ b/Stars45/Particles.cpp
diff --git a/nGenEx/Particles.h b/Stars45/Particles.h
index ac0bc2b..ac0bc2b 100644
--- a/nGenEx/Particles.h
+++ b/Stars45/Particles.h
diff --git a/nGenEx/Pcx.h b/Stars45/Pcx.h
index 7366619..7366619 100644
--- a/nGenEx/Pcx.h
+++ b/Stars45/Pcx.h
diff --git a/nGenEx/Physical.cpp b/Stars45/Physical.cpp
index 2bdb967..2bdb967 100644
--- a/nGenEx/Physical.cpp
+++ b/Stars45/Physical.cpp
diff --git a/nGenEx/Physical.h b/Stars45/Physical.h
index 623d8b6..623d8b6 100644
--- a/nGenEx/Physical.h
+++ b/Stars45/Physical.h
diff --git a/nGenEx/PngImage.cpp b/Stars45/PngImage.cpp
index 2afa03e..2afa03e 100644
--- a/nGenEx/PngImage.cpp
+++ b/Stars45/PngImage.cpp
diff --git a/nGenEx/PngImage.h b/Stars45/PngImage.h
index e457723..e457723 100644
--- a/nGenEx/PngImage.h
+++ b/Stars45/PngImage.h
diff --git a/nGenEx/Polygon.cpp b/Stars45/Polygon.cpp
index 3eefe87..3eefe87 100644
--- a/nGenEx/Polygon.cpp
+++ b/Stars45/Polygon.cpp
diff --git a/nGenEx/Polygon.h b/Stars45/Polygon.h
index fe9c6af..fe9c6af 100644
--- a/nGenEx/Polygon.h
+++ b/Stars45/Polygon.h
diff --git a/nGenEx/Projector.cpp b/Stars45/Projector.cpp
index 6881682..6881682 100644
--- a/nGenEx/Projector.cpp
+++ b/Stars45/Projector.cpp
diff --git a/nGenEx/Projector.h b/Stars45/Projector.h
index d314ec5..d314ec5 100644
--- a/nGenEx/Projector.h
+++ b/Stars45/Projector.h
diff --git a/nGenEx/Random.cpp b/Stars45/Random.cpp
index 57752e9..57752e9 100644
--- a/nGenEx/Random.cpp
+++ b/Stars45/Random.cpp
diff --git a/nGenEx/Random.h b/Stars45/Random.h
index 0c12290..0c12290 100644
--- a/nGenEx/Random.h
+++ b/Stars45/Random.h
diff --git a/Parser/Reader.cpp b/Stars45/Reader.cpp
index d53a558..d53a558 100644
--- a/Parser/Reader.cpp
+++ b/Stars45/Reader.cpp
diff --git a/Parser/Reader.h b/Stars45/Reader.h
index af69b52..af69b52 100644
--- a/Parser/Reader.h
+++ b/Stars45/Reader.h
diff --git a/nGenEx/Res.cpp b/Stars45/Res.cpp
index ff46614..ff46614 100644
--- a/nGenEx/Res.cpp
+++ b/Stars45/Res.cpp
diff --git a/nGenEx/Res.h b/Stars45/Res.h
index cc911fb..cc911fb 100644
--- a/nGenEx/Res.h
+++ b/Stars45/Res.h
diff --git a/nGenEx/RichTextBox.cpp b/Stars45/RichTextBox.cpp
index d45a74e..d45a74e 100644
--- a/nGenEx/RichTextBox.cpp
+++ b/Stars45/RichTextBox.cpp
diff --git a/nGenEx/RichTextBox.h b/Stars45/RichTextBox.h
index 4d382e4..4d382e4 100644
--- a/nGenEx/RichTextBox.h
+++ b/Stars45/RichTextBox.h
diff --git a/nGenEx/Scene.cpp b/Stars45/Scene.cpp
index b9b3167..b9b3167 100644
--- a/nGenEx/Scene.cpp
+++ b/Stars45/Scene.cpp
diff --git a/nGenEx/Scene.h b/Stars45/Scene.h
index 1c0a894..1c0a894 100644
--- a/nGenEx/Scene.h
+++ b/Stars45/Scene.h
diff --git a/nGenEx/Screen.cpp b/Stars45/Screen.cpp
index 8361216..8361216 100644
--- a/nGenEx/Screen.cpp
+++ b/Stars45/Screen.cpp
diff --git a/nGenEx/Screen.h b/Stars45/Screen.h
index d74a759..d74a759 100644
--- a/nGenEx/Screen.h
+++ b/Stars45/Screen.h
diff --git a/nGenEx/ScrollWindow.cpp b/Stars45/ScrollWindow.cpp
index 15a65ca..15a65ca 100644
--- a/nGenEx/ScrollWindow.cpp
+++ b/Stars45/ScrollWindow.cpp
diff --git a/nGenEx/ScrollWindow.h b/Stars45/ScrollWindow.h
index a2259c8..a2259c8 100644
--- a/nGenEx/ScrollWindow.h
+++ b/Stars45/ScrollWindow.h
diff --git a/nGenEx/Sha1.cpp b/Stars45/Sha1.cpp
index 7bbfd77..7bbfd77 100644
--- a/nGenEx/Sha1.cpp
+++ b/Stars45/Sha1.cpp
diff --git a/nGenEx/Sha1.h b/Stars45/Sha1.h
index 8b042cb..8b042cb 100644
--- a/nGenEx/Sha1.h
+++ b/Stars45/Sha1.h
diff --git a/nGenEx/Shadow.cpp b/Stars45/Shadow.cpp
index 0954307..0954307 100644
--- a/nGenEx/Shadow.cpp
+++ b/Stars45/Shadow.cpp
diff --git a/nGenEx/Shadow.h b/Stars45/Shadow.h
index b6d690c..b6d690c 100644
--- a/nGenEx/Shadow.h
+++ b/Stars45/Shadow.h
diff --git a/nGenEx/Skin.cpp b/Stars45/Skin.cpp
index e28c4c5..e28c4c5 100644
--- a/nGenEx/Skin.cpp
+++ b/Stars45/Skin.cpp
diff --git a/nGenEx/Skin.h b/Stars45/Skin.h
index 276d9c0..276d9c0 100644
--- a/nGenEx/Skin.h
+++ b/Stars45/Skin.h
diff --git a/nGenEx/Slider.cpp b/Stars45/Slider.cpp
index bc89883..bc89883 100644
--- a/nGenEx/Slider.cpp
+++ b/Stars45/Slider.cpp
diff --git a/nGenEx/Slider.h b/Stars45/Slider.h
index e1a5347..e1a5347 100644
--- a/nGenEx/Slider.h
+++ b/Stars45/Slider.h
diff --git a/nGenEx/Solid.cpp b/Stars45/Solid.cpp
index bc10425..bc10425 100644
--- a/nGenEx/Solid.cpp
+++ b/Stars45/Solid.cpp
diff --git a/nGenEx/Solid.h b/Stars45/Solid.h
index ef745ca..ef745ca 100644
--- a/nGenEx/Solid.h
+++ b/Stars45/Solid.h
diff --git a/nGenEx/Sound.cpp b/Stars45/Sound.cpp
index d8a634f..d8a634f 100644
--- a/nGenEx/Sound.cpp
+++ b/Stars45/Sound.cpp
diff --git a/nGenEx/Sound.h b/Stars45/Sound.h
index d4e0374..d4e0374 100644
--- a/nGenEx/Sound.h
+++ b/Stars45/Sound.h
diff --git a/nGenEx/SoundCard.cpp b/Stars45/SoundCard.cpp
index 19f5465..19f5465 100644
--- a/nGenEx/SoundCard.cpp
+++ b/Stars45/SoundCard.cpp
diff --git a/nGenEx/SoundCard.h b/Stars45/SoundCard.h
index 295a6e2..295a6e2 100644
--- a/nGenEx/SoundCard.h
+++ b/Stars45/SoundCard.h
diff --git a/nGenEx/SoundD3D.cpp b/Stars45/SoundD3D.cpp
index a148e69..a148e69 100644
--- a/nGenEx/SoundD3D.cpp
+++ b/Stars45/SoundD3D.cpp
diff --git a/nGenEx/SoundD3D.h b/Stars45/SoundD3D.h
index 3a8e089..3a8e089 100644
--- a/nGenEx/SoundD3D.h
+++ b/Stars45/SoundD3D.h
diff --git a/nGenEx/Sprite.cpp b/Stars45/Sprite.cpp
index 4fd565c..4fd565c 100644
--- a/nGenEx/Sprite.cpp
+++ b/Stars45/Sprite.cpp
diff --git a/nGenEx/Sprite.h b/Stars45/Sprite.h
index b28b91c..b28b91c 100644
--- a/nGenEx/Sprite.h
+++ b/Stars45/Sprite.h
diff --git a/Parser/Term.cpp b/Stars45/Term.cpp
index 1a0c6af..1a0c6af 100644
--- a/Parser/Term.cpp
+++ b/Stars45/Term.cpp
diff --git a/Parser/Term.h b/Stars45/Term.h
index a0317dd..a0317dd 100644
--- a/Parser/Term.h
+++ b/Stars45/Term.h
diff --git a/nGenEx/TexCubeDX9.cpp b/Stars45/TexCubeDX9.cpp
index 49bb607..49bb607 100644
--- a/nGenEx/TexCubeDX9.cpp
+++ b/Stars45/TexCubeDX9.cpp
diff --git a/nGenEx/TexCubeDX9.h b/Stars45/TexCubeDX9.h
index b636677..b636677 100644
--- a/nGenEx/TexCubeDX9.h
+++ b/Stars45/TexCubeDX9.h
diff --git a/nGenEx/TexDX9.cpp b/Stars45/TexDX9.cpp
index 5c03c07..5c03c07 100644
--- a/nGenEx/TexDX9.cpp
+++ b/Stars45/TexDX9.cpp
diff --git a/nGenEx/TexDX9.h b/Stars45/TexDX9.h
index a2bd056..a2bd056 100644
--- a/nGenEx/TexDX9.h
+++ b/Stars45/TexDX9.h
diff --git a/nGenEx/TimeSnap.h b/Stars45/TimeSnap.h
index a8f77d2..a8f77d2 100644
--- a/nGenEx/TimeSnap.h
+++ b/Stars45/TimeSnap.h
diff --git a/Parser/Token.cpp b/Stars45/Token.cpp
index 857791b..857791b 100644
--- a/Parser/Token.cpp
+++ b/Stars45/Token.cpp
diff --git a/Parser/Token.h b/Stars45/Token.h
index d519d5b..d519d5b 100644
--- a/Parser/Token.h
+++ b/Stars45/Token.h
diff --git a/nGenEx/Types.h b/Stars45/Types.h
index 5798536..5798536 100644
--- a/nGenEx/Types.h
+++ b/Stars45/Types.h
diff --git a/nGenEx/Universe.h b/Stars45/Universe.h
index dae7c58..dae7c58 100644
--- a/nGenEx/Universe.h
+++ b/Stars45/Universe.h
diff --git a/nGenEx/Video.cpp b/Stars45/Video.cpp
index 260591f..260591f 100644
--- a/nGenEx/Video.cpp
+++ b/Stars45/Video.cpp
diff --git a/nGenEx/Video.h b/Stars45/Video.h
index db34bcc..db34bcc 100644
--- a/nGenEx/Video.h
+++ b/Stars45/Video.h
diff --git a/nGenEx/VideoDX9.cpp b/Stars45/VideoDX9.cpp
index 397e628..397e628 100644
--- a/nGenEx/VideoDX9.cpp
+++ b/Stars45/VideoDX9.cpp
diff --git a/nGenEx/VideoDX9.h b/Stars45/VideoDX9.h
index fdc37ff..fdc37ff 100644
--- a/nGenEx/VideoDX9.h
+++ b/Stars45/VideoDX9.h
diff --git a/nGenEx/VideoDX9Enum.cpp b/Stars45/VideoDX9Enum.cpp
index c2445fb..c2445fb 100644
--- a/nGenEx/VideoDX9Enum.cpp
+++ b/Stars45/VideoDX9Enum.cpp
diff --git a/nGenEx/VideoDX9Enum.h b/Stars45/VideoDX9Enum.h
index 80c0b89..80c0b89 100644
--- a/nGenEx/VideoDX9Enum.h
+++ b/Stars45/VideoDX9Enum.h
diff --git a/nGenEx/VideoDX9VertexBuffer.cpp b/Stars45/VideoDX9VertexBuffer.cpp
index aedc41e..aedc41e 100644
--- a/nGenEx/VideoDX9VertexBuffer.cpp
+++ b/Stars45/VideoDX9VertexBuffer.cpp
diff --git a/nGenEx/VideoDX9VertexBuffer.h b/Stars45/VideoDX9VertexBuffer.h
index 5684dbf..5684dbf 100644
--- a/nGenEx/VideoDX9VertexBuffer.h
+++ b/Stars45/VideoDX9VertexBuffer.h
diff --git a/nGenEx/VideoFactory.cpp b/Stars45/VideoFactory.cpp
index 01a6216..01a6216 100644
--- a/nGenEx/VideoFactory.cpp
+++ b/Stars45/VideoFactory.cpp
diff --git a/nGenEx/VideoFactory.h b/Stars45/VideoFactory.h
index a24b2e2..a24b2e2 100644
--- a/nGenEx/VideoFactory.h
+++ b/Stars45/VideoFactory.h
diff --git a/nGenEx/VideoSettings.cpp b/Stars45/VideoSettings.cpp
index 995358c..995358c 100644
--- a/nGenEx/VideoSettings.cpp
+++ b/Stars45/VideoSettings.cpp
diff --git a/nGenEx/VideoSettings.h b/Stars45/VideoSettings.h
index ad03222..ad03222 100644
--- a/nGenEx/VideoSettings.h
+++ b/Stars45/VideoSettings.h
diff --git a/nGenEx/View.h b/Stars45/View.h
index 3c1eb61..3c1eb61 100644
--- a/nGenEx/View.h
+++ b/Stars45/View.h
diff --git a/nGenEx/Water.cpp b/Stars45/Water.cpp
index 83457c0..83457c0 100644
--- a/nGenEx/Water.cpp
+++ b/Stars45/Water.cpp
diff --git a/nGenEx/Water.h b/Stars45/Water.h
index b4fe4db..b4fe4db 100644
--- a/nGenEx/Water.h
+++ b/Stars45/Water.h
diff --git a/nGenEx/Wave.h b/Stars45/Wave.h
index 058fc27..058fc27 100644
--- a/nGenEx/Wave.h
+++ b/Stars45/Wave.h
diff --git a/nGenEx/WebBrowser.cpp b/Stars45/WebBrowser.cpp
index 26da83f..26da83f 100644
--- a/nGenEx/WebBrowser.cpp
+++ b/Stars45/WebBrowser.cpp
diff --git a/nGenEx/WebBrowser.h b/Stars45/WebBrowser.h
index 4248e06..4248e06 100644
--- a/nGenEx/WebBrowser.h
+++ b/Stars45/WebBrowser.h
diff --git a/nGenEx/Window.cpp b/Stars45/Window.cpp
index a8f1450..a8f1450 100644
--- a/nGenEx/Window.cpp
+++ b/Stars45/Window.cpp
diff --git a/nGenEx/Window.h b/Stars45/Window.h
index 6688b44..6688b44 100644
--- a/nGenEx/Window.h
+++ b/Stars45/Window.h
diff --git a/Parser/stdafx.h b/Stars45/stdafx.h
index 071c3ed..071c3ed 100644
--- a/Parser/stdafx.h
+++ b/Stars45/stdafx.h
diff --git a/nGenEx/CMakeLists.txt b/nGenEx/CMakeLists.txt
deleted file mode 100644
index 6ce5be9..0000000
--- a/nGenEx/CMakeLists.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-project(nGenEx)
-add_library(
-	nGenEx STATIC
-	ActiveWindow.cpp
-	Archive.cpp
-	AviFile.cpp
-	Bitmap.cpp
-	Bmp.cpp
-	Bolt.cpp
-	Button.cpp
-	Camera.cpp
-	CameraView.cpp
-	Color.cpp
-	ComboBox.cpp
-	ComboList.cpp
-	ContentBundle.cpp
-	D3DXImage.cpp
-	DataLoader.cpp
-	EditBox.cpp
-	Encrypt.cpp
-	EventDispatch.cpp
-	FadeView.cpp
-	Fix.cpp
-	Font.cpp
-	FontMgr.cpp
-	FormatUtil.cpp
-	FormDef.cpp
-	FormWindow.cpp
-	Game.cpp
-	Geometry.cpp
-	Graphic.cpp
-	ImageBox.cpp
-	ImgView.cpp
-	Joystick.cpp
-	Keyboard.cpp
-	Layout.cpp
-	Light.cpp
-	ListBox.cpp
-	Locale_ss.cpp
-	MachineInfo.cpp
-	MCIWave.cpp
-	Menu.cpp
-	MouseController.cpp
-	Mouse.cpp
-	MultiController.cpp
-	ParseUtil.cpp
-	Particles.cpp
-	Physical.cpp
-	PngImage.cpp
-	Polygon.cpp
-	Projector.cpp
-	Random.cpp
-	Res.cpp
-	RichTextBox.cpp
-	Scene.cpp
-	Screen.cpp
-	ScrollWindow.cpp
-	Sha1.cpp
-	Shadow.cpp
-	Skin.cpp
-	Slider.cpp
-	Solid.cpp
-	SoundCard.cpp
-	Sound.cpp
-	SoundD3D.cpp
-	Sprite.cpp
-	TexCubeDX9.cpp
-	TexDX9.cpp
-	Video.cpp
-	VideoDX9.cpp
-	VideoDX9Enum.cpp
-	VideoDX9VertexBuffer.cpp
-	VideoFactory.cpp
-	VideoSettings.cpp
-	Water.cpp
-	WebBrowser.cpp
-	Window.cpp
-	)
-target_include_directories(
-	nGenEx
-	PUBLIC .
-	PUBLIC $ENV{DXSDK_DIR}/Include
-	PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode/OpcodeLib  # FIXME: Opcode is badly injured.
-	)
-target_precompile_headers(
-	nGenEx
-	PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../Opcode/OpcodeLib/StdAfx.h
-	)
-target_link_libraries(
-	nGenEx
-	PUBLIC FoundationEx
-	PUBLIC Parser
-	PUBLIC Zlib::zlib
-	PUBLIC Vorbis::vorbis
-	PUBLIC Vorbis::vorbisfile
-	PUBLIC Ogg::ogg
-	PUBLIC Png::png
-	PUBLIC Opcode
-	)
-target_compile_definitions(
-	nGenEx
-	PRIVATE _ALLOW_KEYWORD_MACROS
-	)